Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 3ec48687..fa62c850 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -228,7 +228,7 @@ exports.Properties = Montage.create(Component, {
 
             if(isRoot) {
                 var backgroundChip = this.customSections[0].content.controls["background"];
-                backgroundChip.color = ElementsMediator.getProperty(el, "background");
+                if(backgroundChip) backgroundChip.color = ElementsMediator.getProperty(el, "background");
             }
 
                         var previousInput = this.application.ninja.colorController.colorModel.input;