diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index d8cfc3637..453066f58 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -482,7 +482,7 @@ RED.view = (function() {
                 try {
                     nn._def.onadd.call(nn);
                 } catch(err) {
-                    console.log("onadd:",err);
+                    console.log("Definition error: "+nn.type+".onadd:",err);
                 }
             }
         } else {
@@ -2581,7 +2581,7 @@ RED.view = (function() {
                             try {
                                 node.n._def.onadd.call(node.n);
                             } catch(err) {
-                                console.log("onadd:",err);
+                                console.log("Definition error: "+node.n.type+".onadd:",err);
                             }
                         }
 
diff --git a/nodes/core/core/60-link.html b/nodes/core/core/60-link.html
index 5092ba5b1..24716318c 100644
--- a/nodes/core/core/60-link.html
+++ b/nodes/core/core/60-link.html
@@ -251,7 +251,7 @@
     function onAdd() {
         for (var i=0;i<this.links.length;i++) {
             var n = RED.nodes.node(this.links[i]);
-            if (n.links.indexOf(this.id) === -1) {
+            if (n && n.links.indexOf(this.id) === -1) {
                 n.links.push(this.id);
             }
         }