diff --git a/packages/node_modules/@node-red/nodes/core/io/22-websocket.js b/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
index befb8bcff..c04fd77f7 100644
--- a/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
+++ b/packages/node_modules/@node-red/nodes/core/io/22-websocket.js
@@ -194,20 +194,23 @@ module.exports = function(RED) {
     }
 
     WebSocketListenerNode.prototype.broadcast = function(data) {
-        try {
-            if (this.isServer) {
-                for (let client in this._clients) {
-                    if (this._clients.hasOwnProperty(client)) {
+        if (this.isServer) {
+            for (let client in this._clients) {
+                if (this._clients.hasOwnProperty(client)) {
+                    try {
                         this._clients[client].send(data);
+                    } catch(err) {
+                        this.warn(RED._("websocket.errors.send-error")+" "+client+" "+err.toString())
                     }
                 }
             }
-            else {
-                this.server.send(data);
-            }
         }
-        catch(e) { // swallow any errors
-            this.warn("ws:"+i+" : "+e);
+        else {
+            try {
+                this.server.send(data);
+            } catch(err) {
+                this.warn(RED._("websocket.errors.send-error")+" "+err.toString())
+            }
         }
     }