diff --git a/lib/core/job.py b/lib/core/job.py
index f3aefa6..c543ce8 100644
--- a/lib/core/job.py
+++ b/lib/core/job.py
@@ -51,7 +51,7 @@ class Job:
 
             self.handle_threshold(self.service.get_threshold(), jobInfo.was_execution_successful())
 
-            self.log.d("Error Code: " + str(jobInfo.get_errorcode()) + " Message: " + str(jobInfo.get_message()))
+            self.log.d("Error Code: " + str(jobInfo.get_errorcode()) + ", Message: " + str(jobInfo.get_message()))
 
             self.jobInfos.append(jobInfo)
 
diff --git a/lib/services/tcpconnect.py b/lib/services/tcpconnect.py
index 119039f..a070ad9 100644
--- a/lib/services/tcpconnect.py
+++ b/lib/services/tcpconnect.py
@@ -27,16 +27,14 @@ class TcpconnectService(Service):
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         except socket.error, msg:
-            #log.w("%s\n" % msg[1])
             jobInfo.set_errorcode(1)
-            jobInfo.set_message("Could not create socket.")
+            jobInfo.set_message("Could not create socket. (" + msg[1] + ")")
 
         try:
             sock.connect((jobInfo.get_host(), self.port))
         except socket.error, msg:
-            #log.w("%s\n" % msg[1])
             jobInfo.set_errorcode(2)
-            jobInfo.set_message("Could not establish connection.")
+            jobInfo.set_message("Could not establish connection. (" + msg[1] + ")")
 
         if jobInfo.get_errorcode() == -1:
             jobInfo.set_execution_successful(True)
@@ -45,6 +43,5 @@ class TcpconnectService(Service):
         sock.close()
 
 
-
 def create(kwargs):
     return TcpconnectService(**kwargs)
\ No newline at end of file