diff --git a/nodes/core/io/22-websocket.js b/nodes/core/io/22-websocket.js
index a42c3fcf9..fe1b47fdf 100644
--- a/nodes/core/io/22-websocket.js
+++ b/nodes/core/io/22-websocket.js
@@ -212,7 +212,9 @@ module.exports = function(RED) {
             this.error(RED._("websocket.errors.missing-conf"));
         }
         this.on('close', function() {
-            node.serverConfig.removeInputNode(node);
+            if (node.serverConfig) {
+                node.serverConfig.removeInputNode(node);
+            }
             node.status({});
         });
     }
@@ -224,7 +226,7 @@ module.exports = function(RED) {
         this.server = (n.client)?n.client:n.server;
         this.serverConfig = RED.nodes.getNode(this.server);
         if (!this.serverConfig) {
-            this.error(RED._("websocket.errors.missing-conf"));
+            return this.error(RED._("websocket.errors.missing-conf"));
         }
         else {
             // TODO: nls