Merge branch 'master' into brushtool

1 files changed, 5 insertions, 3 deletions

diff --git a/node_modules/montage/ui/controller/array-controller.js b/node_modules/montage/ui/controller/array-controller.js
index 868ae5de..f355efc1 100755
--- a/node_modules/montage/ui/controller/array-controller.js
+++ b/node_modules/montage/ui/controller/array-controller.js
@@ -519,9 +519,11 @@ var ArrayController = exports.ArrayController = Montage.create(ObjectController,
                 return null;
             }
 
-            this._selectedObjects = this.content.filter(function(value, i) {
-                return this._selectedContentIndexes.indexOf(i) >= 0;
-            }, this);
+            if(this.content) {
+                this._selectedObjects = this.content.filter(function(value, i) {
+                    return this._selectedContentIndexes.indexOf(i) >= 0;
+                }, this);
+            }
 
             return this._selectedObjects;
         },