diff --git a/ChangeLog b/ChangeLog
index 862df00e3c..46acb05080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-27  Attilio Fiandrotti  <attilio.fiandrotti@gmail.com>
+
+        * gdk/directfb/gdkcursor-directfb.c: Attempts to load
+          stock X cursors no longer results in annoying error
+          messages under DirectFB
+
 2007-07-27  Michael Natterer  <mitch@imendio.com>
 
 	Fix check/radio indicator drawing mess (bug #452225):
diff --git a/gdk/directfb/gdkcursor-directfb.c b/gdk/directfb/gdkcursor-directfb.c
index 9383c2ba41..8ab7aec7b8 100644
--- a/gdk/directfb/gdkcursor-directfb.c
+++ b/gdk/directfb/gdkcursor-directfb.c
@@ -444,6 +444,9 @@ gdk_cursor_new_from_name (GdkDisplay  *display,
 
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
  pixbuf = gdk_pixbuf_new_from_file(name, NULL);
+ /* Prevents attempts to load stock X cursors from generating error messages */
+ if (pixbuf == NULL)
+   return NULL;
  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
  cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 1, 1);
  g_object_unref (pixbuf);