diff --git a/src/Connection/Connection.py b/src/Connection/Connection.py
index 234053db..7134ded7 100644
--- a/src/Connection/Connection.py
+++ b/src/Connection/Connection.py
@@ -157,11 +157,14 @@ class Connection(object):
                 self.unpacker.feed(buff)
                 buff = None
                 for message in self.unpacker:
-                    self.incomplete_buff_recv = 0
-                    if "stream_bytes" in message:
-                        self.handleStream(message)
-                    else:
-                        self.handleMessage(message)
+                    try:
+                        self.incomplete_buff_recv = 0
+                        if "stream_bytes" in message:
+                            self.handleStream(message)
+                        else:
+                            self.handleMessage(message)
+                    except TypeError:
+                        raise Exception("Invalid message type: %s" % type(message))
 
                 message = None
         except Exception, err: