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 cc55565f2..1729be177 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
@@ -31,7 +31,7 @@ RED.nodes = (function() {
 
     var groups = {};
     var groupsByZ = {};
-
+RED.nl = nodeLinks;
     var initialLoad;
 
     var dirty = false;
@@ -429,13 +429,13 @@ RED.nodes = (function() {
         var index = links.indexOf(l);
         if (index != -1) {
             links.splice(index,1);
-            if (l.source) {
+            if (l.source && nodeLinks[l.source.id]) {
                 var sIndex = nodeLinks[l.source.id].out.indexOf(l)
                 if (sIndex !== -1) {
                     nodeLinks[l.source.id].out.splice(sIndex,1)
                 }
             }
-            if (l.target) {
+            if (l.target && nodeLinks[l.target.id]) {
                 var tIndex = nodeLinks[l.target.id].in.indexOf(l)
                 if (tIndex !== -1) {
                     nodeLinks[l.target.id].in.splice(tIndex,1)