diff --git a/ChangeLog b/ChangeLog
index 9695e61da..e55ac6b58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-25  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-texture.c (clutter_texture_set_property): Do
+	not try to set NULL pixbufs.
+
 2007-10-25  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-actor.c: Implement part of the ClutterScriptable
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 98effc743..2b24187d5 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -797,9 +797,10 @@ clutter_texture_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_PIXBUF:
-      clutter_texture_set_pixbuf (texture,
-				  GDK_PIXBUF (g_value_get_object (value)),
-				  NULL);
+      if (g_value_get_object (value))
+        clutter_texture_set_pixbuf (texture,
+                                    GDK_PIXBUF (g_value_get_object (value)),
+				    NULL);
       break;
     case PROP_USE_TILES:
       priv->is_tiled = g_value_get_boolean (value);