gistfile1.diff

diff --git a/frameworks/foundation/views/view.js b/frameworks/foundation/views/v
index f7a29fb..07261d3 100644
--- a/frameworks/foundation/views/view.js
+++ b/frameworks/foundation/views/view.js
@@ -2306,7 +2306,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
         for(key in this._activeAnimations){
           // TODO: Check for more than duration
           if (
-            newStyle[key] !== currentStyle[key] ||
+            newStyle[key] !== (currentStyle && currentStyle[key]) ||
             !this._pendingAnimations || !this._pendingAnimations[key] ||
             this._activeAnimations[key].duration !== this._pendingAnimations[ke
           ) {
@@ -2351,7 +2351,7 @@ SC.View = SC.Responder.extend(SC.DelegateSupport,
       }
 
       // FIXME: Not really sure this is the right way to do it, but we don't wa
-      layer.style[SC.platform.domCSSPrefix+"Transition"] = updatedCSS.join(', '
+      if (layer) layer.style[SC.platform.domCSSPrefix+"Transition"] = updatedCS
     }