1 files changed, 8 insertions, 1 deletions

diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js
index b284fc47..1e1c9e5b 100644
--- a/js/tools/bindingTool.js
+++ b/js/tools/bindingTool.js
@@ -34,7 +34,12 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
                 NJevent("enableStageMove");
                 this.application.ninja.workspaceMode = "binding";
                 if (this.application.ninja.selectedElements.length !== 0 ) {
-                    this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                    if(typeof(this.application.ninja.selectedElements[0].controller) !== "undefined") {
+                        this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                    } else {
+                        this.selectedComponent = null;
+                    }
+
                 }
             }
             else
@@ -81,6 +86,8 @@ exports.BindingTool = Montage.create(ModifierToolBase, {
                     if (this.application.ninja.selectedElements.length !== 0 ) {
                         if(this.application.ninja.selectedElements[0].controller) {
                             this.selectedComponent = this.application.ninja.selectedElements[0].controller;
+                        } else {
+                            this.selectedComponent = null;
                         }
                     } else {
                         this.selectedComponent = null;