diff --git a/clutter/clutter/clutter-transition.c b/clutter/clutter/clutter-transition.c
index 0342bc967..06e5e2fad 100644
--- a/clutter/clutter/clutter-transition.c
+++ b/clutter/clutter/clutter-transition.c
@@ -355,7 +355,7 @@ clutter_transition_set_animatable (ClutterTransition *transition,
                                    ClutterAnimatable *animatable)
 {
   ClutterTransitionPrivate *priv;
-  ClutterActor *actor;
+  ClutterActor *actor = NULL;
 
   g_return_if_fail (CLUTTER_IS_TRANSITION (transition));
   g_return_if_fail (animatable == NULL || CLUTTER_IS_ANIMATABLE (animatable));
@@ -374,9 +374,9 @@ clutter_transition_set_animatable (ClutterTransition *transition,
     {
       priv->animatable = g_object_ref (animatable);
       clutter_transition_attach (transition, priv->animatable);
+      actor = clutter_animatable_get_actor (animatable);
     }
 
-  actor = clutter_animatable_get_actor (animatable);
   clutter_timeline_set_actor (CLUTTER_TIMELINE (transition), actor);
 }