Binding Panel - Add getPropertyList and fix null currentObject

1 files changed, 7 insertions, 3 deletions

diff --git a/js/panels/binding/binding-item.reel/binding-item.js b/js/panels/binding/binding-item.reel/binding-item.js
index 294e8d35..55230fc3 100644
--- a/js/panels/binding/binding-item.reel/binding-item.js
+++ b/js/panels/binding/binding-item.reel/binding-item.js
@@ -20,8 +20,10 @@ exports.BindingItem = Montage.create(Component, {
         set: function(value) {
             if(value === this._sourceObject) { return; }
 
-            this.sourceObjectLabel = value.identifier;
-            
+            if(value && value.identifier) {
+                this.sourceObjectLabel = value.identifier;
+            }
+
             this._sourceObject = value;
         }
     },
@@ -33,7 +35,9 @@ exports.BindingItem = Montage.create(Component, {
         set: function(value) {
             if(value === this._boundObject) { return; }
 
-            this.boundObjectLabel = value.identifier;
+            if(value && value.identifier) {
+                this.boundObjectLabel = value.identifier;
+            }
 
             this._boundObject = value;
         }