diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js
index 5e81f9a0..a5f14475 100644
--- a/mindplot/src/main/javascript/Designer.js
+++ b/mindplot/src/main/javascript/Designer.js
@@ -684,7 +684,6 @@ mindplot.Designer = new Class({
             dmodel.addRelationship(result);
 
 
-
             return  result;
         },
 
@@ -827,13 +826,17 @@ mindplot.Designer = new Class({
         addLink:function () {
             var model = this.getModel();
             var topic = model.selectedTopic();
-            topic.showLinkEditor();
+            if (topic) {
+                topic.showLinkEditor();
+            }
         },
 
         addNote:function () {
             var model = this.getModel();
             var topic = model.selectedTopic();
-            topic.showNoteEditor();
+            if (topic) {
+                topic.showNoteEditor();
+            }
         },
 
         goToNode:function (node) {