hbcodeXCI
diff --git a/‎ui/animation/animation.android.ts
Lines changed: 14 additions & 7 deletions b/‎ui/animation/animation.android.ts
Lines changed: 14 additions & 7 deletions
diff --git a/‎ui/styling/css-selector.ts
Lines changed: 1 addition & 1 deletion b/‎ui/styling/css-selector.ts
Lines changed: 1 addition & 1 deletion
@@ -32,9 +32,9 @@ export class Animation extends common.Animation implements definition.Animation
     private _propertyUpdateCallbacks: Array<Function>;
     private _propertyResetCallbacks: Array<Function>;
     private _valueSource: number;
-    
+
     public play(): definition.AnimationPromise {
-        var animationFinishedPromise = super.play();
+        let animationFinishedPromise = super.play();
 
         let i: number;
         let length: number;
@@ -58,11 +58,13 @@ export class Animation extends common.Animation implements definition.Animation
 
         this._animatorSet = new android.animation.AnimatorSet();
         this._animatorSet.addListener(this._animatorListener);
-        if (this._playSequentially) {
-            this._animatorSet.playSequentially(this._nativeAnimatorsArray);
-        }
-        else {
-            this._animatorSet.playTogether(this._nativeAnimatorsArray);
+        if (length > 0) {
+            if (this._playSequentially) {
+                this._animatorSet.playSequentially(this._nativeAnimatorsArray);
+            }
+            else {
+                this._animatorSet.playTogether(this._nativeAnimatorsArray);
+            }
         }
 
         trace.write("Starting " + this._nativeAnimatorsArray.length + " animations " + (this._playSequentially ? "sequentially." : "together."), trace.categories.Animation);
@@ -127,6 +129,11 @@ export class Animation extends common.Animation implements definition.Animation
     }
 
     private _createAnimators(propertyAnimation: common.PropertyAnimation): void {
+
+        if (!propertyAnimation.target._nativeView) {
+            return;
+        }
+
         trace.write("Creating ObjectAnimator(s) for animation: " + common.Animation._getAnimationInfo(propertyAnimation) + "...", trace.categories.Animation);
 
         if (types.isNullOrUndefined(propertyAnimation.target)) {
 
@@ -88,7 +88,7 @@ export class CssSelector {
                 }
             }
         });
-        if (this.animations && view.isLoaded) {
+        if (this.animations && view.isLoaded && view._nativeView !== undefined) {
             for (let animationInfo of this.animations) {
                 let animation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animationInfo, modifier);
                 if (animation) {
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class CssSelector {`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`});`
`91`		`- if (this.animations && view.isLoaded) {`
	`91`	`+ if (this.animations && view.isLoaded && view._nativeView !== undefined) {`
`92`	`92`	`for (let animationInfo of this.animations) {`
`93`	`93`	`let animation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animationInfo, modifier);`
`94`	`94`	`if (animation) {`