diff --git a/guacamole-common-js/src/main/resources/tunnel.js b/guacamole-common-js/src/main/resources/tunnel.js
index 50d596948..79343da97 100644
--- a/guacamole-common-js/src/main/resources/tunnel.js
+++ b/guacamole-common-js/src/main/resources/tunnel.js
@@ -548,6 +548,13 @@ Guacamole.WebSocketTunnel = function(tunnelURL) {
             currentState = STATE_CONNECTED;
         };
 
+        socket.onerror = function(event) {
+
+            // Call error handler
+            if (tunnel.onerror) tunnel.onerror(event.data);
+
+        };
+
         socket.onmessage = function(event) {
 
             var message = event.data;