diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
index 2bf9e9e16..dd4cc5495 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Subflow.js
@@ -409,7 +409,11 @@ function remapSubflowNodes(nodes,nodeMap) {
                 for (j=0;j<outputs.length;j++) {
                     wires = outputs[j];
                     for (k=0;k<wires.length;k++) {
-                        outputs[j][k] = nodeMap[outputs[j][k]].id
+                        if (nodeMap[outputs[j][k]]) {
+                            outputs[j][k] = nodeMap[outputs[j][k]].id
+                        } else {
+                            outputs[j][k] = null;
+                        }
                     }
                 }
             }
@@ -421,7 +425,6 @@ function remapSubflowNodes(nodes,nodeMap) {
                 for (var prop in node) {
                     if (node.hasOwnProperty(prop) && prop !== '_alias') {
                         if (nodeMap[node[prop]]) {
-                            //console.log("Mapped",node.type,node.id,prop,nodeMap[node[prop]].id);
                             node[prop] = nodeMap[node[prop]].id;
                         }
                     }