diff --git a/nodes/core/core/58-debug.js b/nodes/core/core/58-debug.js
index 1b67cc8b0..68a2e5f77 100644
--- a/nodes/core/core/58-debug.js
+++ b/nodes/core/core/58-debug.js
@@ -94,6 +94,13 @@ DebugNode.wsServer.on('connection',function(ws) {
 			}
 		}
 	});
+	ws.on('error', function(err) {
+	    util.log("[debug] ws error : "+err);
+	});
+});
+
+DebugNode.wsServer.on('error', function(err) {
+    util.log("[debug] ws server error : "+err);
 });
 
 DebugNode.logHandler = new events.EventEmitter();
diff --git a/nodes/core/io/22-websocket.js b/nodes/core/io/22-websocket.js
index 4638dd1ba..a311f3831 100644
--- a/nodes/core/io/22-websocket.js
+++ b/nodes/core/io/22-websocket.js
@@ -66,6 +66,9 @@ function WebSocketListenerNode(n) {
         socket.on('message',function(data,flags){
             node.handleEvent(id,socket,'message',data,flags);
         });
+        socket.on('error', function(err) {
+            node.warn("An error occured on the ws connection: "+inspect(err));
+        });
     });
 
     node.on("close", function() {