Merge branch 'master'

Kinnara · Apr 23, 2014 · c53f142 · c53f142
2 parents 60a2b5e + b352197
commit c53f142
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Microsoft.Phone.Controls.Toolkit/Transitions/TransitionFrame.cs b/Microsoft.Phone.Controls.Toolkit/Transitions/TransitionFrame.cs
@@ -230,9 +230,15 @@ private void EnsureLastTransitionIsComplete()
 
                 // If the app calls GoBack on NavigatedTo, we want the old content to be null
                 // because you can't have the same content in two spots on the visual tree.
-                _oldContentPresenter.Content = null;
+                if (_oldContentPresenter != null)
+                {
+                    _oldContentPresenter.Content = null;
+                }
 
-                _storedOldTransition.Stop();
+                if (_storedOldTransition != null)
+                {
+                    _storedOldTransition.Stop();
+                }
 
                 _storedNavigationOutTransition = null;
                 _storedOldTransition = null;