2 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index c69f28b0..f1882985 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -385,7 +385,7 @@ var Layer = exports.Layer = Montage.create(Component, {
                 return this._bypassAnimation;
         },
         set: function(newVal) {
-                if (newVal !== this._bypassAnimation) {
+                if ((newVal !== this._bypassAnimation) && (typeof(this.layerData) !== "undefined")) {
                         this._bypassAnimation = newVal;
                         this.layerData.bypassAnimation = newVal;        
                 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 978b239f..e294a69e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -100,7 +100,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 return this._bypassAnimation;
         },
         set: function(newVal) {
-                if (newVal !== this._bypassAnimation) {
+                if ((newVal !== this._bypassAnimation) && (typeof(this.trackData) !== "undefined")) {
                         this._bypassAnimation = newVal;
                 this.trackData.bypassAnimation = newVal;
                 }