Merge branch 'refs/heads/timeline-local' into TimelineUber

1 files changed, 3 insertions, 0 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 9cf321b1..c69f28b0 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -417,6 +417,9 @@ var Layer = exports.Layer = Montage.create(Component, {
 
     setData:{
         value:function(){
+                if (typeof(this.layerData) === "undefined") {
+                        return;
+                }
             this.layerName = this.layerData.layerName;
             this.layerID = this.layerData.layerID;
             this.arrLayerStyles = this.layerData.arrLayerStyles;