diff --git a/lib/connection.js b/lib/connection.js
index f606de136..df0f26d02 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -106,7 +106,9 @@ Connection.prototype.attachListeners = function(stream) {
       if(self._emitMessage) {
         self.emit('message', msg);
       }
-      self.emit(msg.name, msg);
+      if(msg.name !== 'error') {
+        self.emit(msg.name, msg);
+      }
       packet = self._reader.read();
     }
   });