diff --git a/socketserver/lib/commands.go b/socketserver/lib/commands.go
new file mode 100644
index 00000000..55c21f80
--- /dev/null
+++ b/socketserver/lib/commands.go
@@ -0,0 +1 @@
+package lib
diff --git a/src/socket.js b/src/socket.js
index bc03b154..3e3d2092 100644
--- a/src/socket.js
+++ b/src/socket.js
@@ -160,6 +160,11 @@ FFZ.prototype.ws_create = function() {
 			else
 				f.log("Invalid command: " + cmd, data, false, true);
 
+		} else if ( cmd === "error" ) {
+			f.log("Socket server reported error: " + data);
+			if (f._ws_callbacks[request] )
+				delete f._ws_callbacks[request];
+
 		} else {
 			var success = cmd === 'True',
 				has_callback = typeof f._ws_callbacks[request] === "function";
@@ -174,7 +179,7 @@ FFZ.prototype.ws_create = function() {
 					f.error("Callback for " + request + ": " + err);
 				}
 
-				f._ws_callbacks[request] = undefined;
+				delete f._ws_callbacks[request];
 			}
 		}
 	}