2 files changed, 10 insertions, 9 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index df1770da..0500ec11 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -108,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionX:{
@@ -127,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextPositionY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionY:{
@@ -146,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleX:{
@@ -165,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleY:{
@@ -184,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewX:{
@@ -203,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewY:{
@@ -222,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextRotate : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextRotate:{
@@ -397,7 +397,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         set:function(val){
             this._layerData = val;
-            this.setData();
+            if(this._layerData){
+                this.setData();
+            }
         }
     },
 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 54c40676..94d9daec 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -499,7 +499,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this._firstTimeLoaded = false;
                 } else {
                     this.arrLayers.length = 0;
-                    this.arrTracks.length = 0;
                     this.hashKey = node.uuid;
 
                     if (this.returnedObject = this.hashInstance.getItem(this.hashKey)) {