diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index fad7ff4bda..7fc76bf703 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3873,12 +3873,17 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
   if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
     {
       if (icon_info->load_error)
-        g_propagate_error (error, icon_info->load_error);
+        {
+          if (*error)
+            *error = g_error_copy (icon_info->load_error);
+        }
       else
-        g_set_error_literal (error,  
-                             GTK_ICON_THEME_ERROR,  
-                             GTK_ICON_THEME_NOT_FOUND,
-                             _("Failed to load icon"));
+        {
+          g_set_error_literal (error,  
+                               GTK_ICON_THEME_ERROR,  
+                               GTK_ICON_THEME_NOT_FOUND,
+                               _("Failed to load icon"));
+        }
  
       return NULL;
     }