--- gtk/gtkdnd.c.old	2012-12-28 16:23:56.021136486 +0100
+++ gtk/gtkdnd.c	2012-12-29 09:29:40.471915065 +0100
@@ -884,6 +884,8 @@ gtk_drag_get_cursor (GtkWidget         *
   if (drag_cursors[i].cursor == NULL)
     {
       ensure_drag_cursor_pixbuf (i);
+      if (drag_cursors[i].pixbuf == NULL)
+        return;      
       drag_cursors[i].cursor = gdk_cursor_new_from_pixbuf (display, drag_cursors[i].pixbuf, 0, 0);
     }
 
@@ -1070,6 +1072,8 @@ gtk_drag_update_cursor (GtkDragSourceInf
   if (i == G_N_ELEMENTS (drag_cursors))
     return;
 
+  if (info->cursor == NULL)
+    return;
   cursor = gtk_drag_get_cursor (info->widget,
                                 gdk_cursor_get_display (info->cursor), 
 				drag_cursors[i].action, info);
