diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index eb46945d44..9d5f62a152 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-06  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 517233 – Calling gdk_pixbuf_loader_close causes "GError set over
+	the top of a previous GError" warning
+
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Don't overwrite
+	errors. Reported by Andrey Tsyvarev
+
 2008-09-05  Sebastien Bacher  <seb128@ubuntu.com>
 
 	* gdk-pixbuf-io.c: (gdk_pixbuf_load_module_unlocked):
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index ce6dc411d7..9ec8125997 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -726,8 +726,12 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
  					 * here, since we might not get an error in the
  					 * gdk_pixbuf_get_file_info() case
  					 */
-					if (tmp)
-						g_propagate_error (error, tmp);
+					if (tmp) {
+						if (error && *error == NULL)
+							g_propagate_error (error, tmp);
+						else
+							g_error_free (tmp);
+					}
                                         retval = FALSE;
                                 }
                 }