diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 2e4f7eef1..1d4a60b78 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,8 @@
 1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
+	* gdesktop.c (desktop_icon_drag_start): Do not attempt to use
+	icons if we could not load the images for the icon.
+
 	* gwidget.c (x_update_input): Keep the cursor always visible. 
 
 	* gview.c (view): Use a buttonbar widget. 
diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c
index ddecd145b..b2c36e5b9 100644
--- a/gnome/gdesktop.c
+++ b/gnome/gdesktop.c
@@ -735,10 +735,12 @@ desktop_icon_drag_start (GtkWidget *widget, GdkEvent *event, desktop_icon_t *di)
 		/* FIXME: we are using the same icon for ok and not ok drags */
 		root_drag_ok_window     = make_transparent_window (fname);
 		root_drag_not_ok_window = make_transparent_window (fname);
-		gdk_dnd_set_drag_shape (root_drag_ok_window->window, &root_icon_drag_hotspot,
-					root_drag_not_ok_window->window, &root_icon_drag_hotspot);
-		gtk_widget_show (root_drag_not_ok_window);
-		gtk_widget_show (root_drag_ok_window);
+		if (root_drag_not_ok_window && root_drag_ok_window){
+			gdk_dnd_set_drag_shape (root_drag_ok_window->window, &root_icon_drag_hotspot,
+						root_drag_not_ok_window->window, &root_icon_drag_hotspot);
+			gtk_widget_show (root_drag_not_ok_window);
+			gtk_widget_show (root_drag_ok_window);
+		}
 		free (fname);
 	}
 }