@@ -341,7 +341,7 @@ class PythonCharts(object):
                         if job.override_name is not None:
                             new_name = job.__module__ + '_' + job.override_name
                             if new_name in overridden:
-                                msg.error(job.chart_name + " already exists. Stopping '" + job.name + "'")
+                                msg.error(job.override_name + " already exists. Stopping '" + job.name + "'")
                                 self._stop(job)
                                 i -= 1
                             else:
@@ -351,9 +351,10 @@ class PythonCharts(object):
                                 overridden.append(job.chart_name)
                     except Exception:
                         pass
-            except AttributeError:
+            except AttributeError as e:
                 self._stop(job)
                 msg.error(job.chart_name, "cannot find check() function.")
+                msg.debug(str(e))
             except (UnboundLocalError, Exception) as e:
                 msg.error(job.chart_name, str(e))
                 self._stop(job)
 
@@ -574,11 +574,13 @@ def _receive(self):
                 buf = self._sock.recv(4096)
                 if len(buf) == 0 or buf is None:
                     break
+
                 data += buf.decode()
                 if self._check_raw_data(data):
                     break
             else:
-                # self._disconnect()
+                self.error("Socket timed out.")
+                self._disconnect()
                 break
 
         return data
 
@@ -67,6 +67,7 @@ def __init__(self, configuration=None, name=None):
         self.order = ORDER
         self.definitions = CHARTS
         self._keep_alive = True
+        self.chart_name = ""
 
     def _get_data(self):
         """
 
@@ -88,7 +88,11 @@ def _check_raw_data(self, data):
         else:
             self._keep_alive = False
 
-        if "client" in data and "server.all" in data:
+        # if "client" in data and "server.all" in data:
+        #     return True
+        # else:
+        #     return False
+        if data[-7:] == "\r\n0\r\n\r\n":
             return True
         else:
             return False