Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO

1 files changed, 4 insertions, 2 deletions

diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index fe8d04e9..c8d323a9 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -400,8 +400,10 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
                     var currentValue = ElementsMediator.getColor(this.parentComponent.parentComponent.parentComponent.parentComponent.layerData.stageElement,this._isFill,this._borderSide)
                     this.application.ninja.timeline.selectedStyle = this.editorProperty;
                     this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false);
-                    this._fillColorCtrl.color(currentValue.colorMode, currentValue.color);
-                    this.addedColorChips = true;
+                    if(currentValue){
+                        this._fillColorCtrl.color(currentValue.colorMode, currentValue.color);
+                        this.addedColorChips = true;
+                    }
                 }
                                 // TODO: set up color chip here.
                         } else if (tweenable.tweener === "input"){