diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 631a87c71..79404a98c 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2617,7 +2617,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
 			g_param_spec_double ("rotation-angle-x",
 					     "Rotation Angle X",
 					     "The rotation angle on the X axis",
-					     0.0,
+					     -G_MAXDOUBLE,
 					     G_MAXDOUBLE,
 					     0.0,
 					     CLUTTER_PARAM_READWRITE));
@@ -2634,7 +2634,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
 			g_param_spec_double ("rotation-angle-y",
 					     "Rotation Angle Y",
 					     "The rotation angle on the Y axis",
-					     0.0,
+					     -G_MAXDOUBLE,
 					     G_MAXDOUBLE,
 					     0.0,
 					     CLUTTER_PARAM_READWRITE));
@@ -2651,7 +2651,7 @@ clutter_actor_class_init (ClutterActorClass *klass)
 			g_param_spec_double ("rotation-angle-z",
 					     "Rotation Angle Z",
 					     "The rotation angle on the Z axis",
-					     0.0,
+					     -G_MAXDOUBLE,
 					     G_MAXDOUBLE,
 					     0.0,
 					     CLUTTER_PARAM_READWRITE));
@@ -5803,9 +5803,14 @@ clutter_actor_get_rotation (ClutterActor      *self,
 
   angle = clutter_actor_get_rotationu (self, axis, &xu, &yu, &zu);
 
-  *x = CLUTTER_UNITS_TO_DEVICE (xu);
-  *y = CLUTTER_UNITS_TO_DEVICE (yu);
-  *z = CLUTTER_UNITS_TO_DEVICE (zu);
+  if (x)
+    *x = CLUTTER_UNITS_TO_DEVICE (xu);
+
+  if (y)
+    *y = CLUTTER_UNITS_TO_DEVICE (yu);
+
+  if (z)
+    *z = CLUTTER_UNITS_TO_DEVICE (zu);
 
   return angle;
 }