diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index 63a841beb..1f60acee0 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -649,42 +649,39 @@ RED.nodes = (function() {
     }
 
     function checkForMatchingSubflow(subflow,subflowNodes) {
+        subflowNodes = subflowNodes || [];
         var i;
         var match = null;
-        try {
-            RED.nodes.eachSubflow(function(sf) {
-                if (sf.name != subflow.name ||
-                    sf.info != subflow.info ||
-                    sf.in.length != subflow.in.length ||
-                    sf.out.length != subflow.out.length) {
-                        return;
-                }
-                var sfNodes = RED.nodes.filterNodes({z:sf.id});
-                if (sfNodes.length != subflowNodes.length) {
+        RED.nodes.eachSubflow(function(sf) {
+            if (sf.name != subflow.name ||
+                sf.info != subflow.info ||
+                sf.in.length != subflow.in.length ||
+                sf.out.length != subflow.out.length) {
                     return;
-                }
+            }
+            var sfNodes = RED.nodes.filterNodes({z:sf.id});
+            if (sfNodes.length != subflowNodes.length) {
+                return;
+            }
 
-                var subflowNodeSet = [subflow].concat(subflowNodes);
-                var sfNodeSet = [sf].concat(sfNodes);
+            var subflowNodeSet = [subflow].concat(subflowNodes);
+            var sfNodeSet = [sf].concat(sfNodes);
 
-                var exportableSubflowNodes = JSON.stringify(subflowNodeSet);
-                var exportableSFNodes = JSON.stringify(createExportableNodeSet(sfNodeSet));
-                var nodeMap = {};
-                for (i=0;i<sfNodes.length;i++) {
-                    exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflowNodes[i].id+"\"","g"),'"'+sfNodes[i].id+'"');
-                }
-                exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflow.id+"\"","g"),'"'+sf.id+'"');
+            var exportableSubflowNodes = JSON.stringify(subflowNodeSet);
+            var exportableSFNodes = JSON.stringify(createExportableNodeSet(sfNodeSet));
+            var nodeMap = {};
+            for (i=0;i<sfNodes.length;i++) {
+                exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflowNodes[i].id+"\"","g"),'"'+sfNodes[i].id+'"');
+            }
+            exportableSubflowNodes = exportableSubflowNodes.replace(new RegExp("\""+subflow.id+"\"","g"),'"'+sf.id+'"');
 
-                if (exportableSubflowNodes !== exportableSFNodes) {
-                    return;
-                }
+            if (exportableSubflowNodes !== exportableSFNodes) {
+                return;
+            }
 
-                match = sf;
-                throw new Error();
-            });
-        } catch(err) {
-            console.log(err.stack);
-        }
+            match = sf;
+            return false;
+        });
         return match;
     }
     function compareNodes(nodeA,nodeB,idMustMatch) {
@@ -1381,31 +1378,41 @@ RED.nodes = (function() {
 
         eachNode: function(cb) {
             for (var n=0;n<nodes.length;n++) {
-                cb(nodes[n]);
+                if (cb(nodes[n]) === false) {
+                    break;
+                }
             }
         },
         eachLink: function(cb) {
             for (var l=0;l<links.length;l++) {
-                cb(links[l]);
+                if (cb(links[l]) === false) {
+                    break;
+                }
             }
         },
         eachConfig: function(cb) {
             for (var id in configNodes) {
                 if (configNodes.hasOwnProperty(id)) {
-                    cb(configNodes[id]);
+                    if (cb(configNodes[id]) === false) {
+                        break;
+                    }
                 }
             }
         },
         eachSubflow: function(cb) {
             for (var id in subflows) {
                 if (subflows.hasOwnProperty(id)) {
-                    cb(subflows[id]);
+                    if (cb(subflows[id]) === false) {
+                        break;
+                    }
                 }
             }
         },
         eachWorkspace: function(cb) {
             for (var i=0;i<workspacesOrder.length;i++) {
-                cb(workspaces[workspacesOrder[i]]);
+                if (cb(workspaces[workspacesOrder[i]]) === false) {
+                    break;
+                }
             }
         },