Bigfixes and cleanup from optimization

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b9ec40ad..77c0dfa8 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -26,7 +26,9 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function(val){
             this._tweenData = val;
-            this.setData();
+            if(this._tweenData){
+                this.setData();
+            }
         }
     },