Index: gtk/gtkdnd.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkdnd.c,v
retrieving revision 1.132.2.7
diff -u -3 -p -u -r1.132.2.7 gtkdnd.c
--- gtk/gtkdnd.c	30 Mar 2006 18:29:04 -0000	1.132.2.7
+++ gtk/gtkdnd.c	20 Apr 2006 20:10:43 -0000
@@ -2784,6 +2784,12 @@ gtk_drag_set_icon_window (GdkDragContext
   GtkDragSourceInfo *info;
 
   info = gtk_drag_get_source_info (context, FALSE);
+  if (info == NULL)
+    {
+      if (destroy_on_release)
+	gtk_widget_destroy (widget);
+      return;
+    }
   gtk_drag_remove_icon (info);
 
   if (widget)
