diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 94415d916f..69dcadaa23 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-png.c: Don't leak in the error path.  (#405539, Daniel Atallah)
+
 2007-02-07  Chris Wilson  <chris@chris-wilson.co.uk>
 
 	* io-jpeg.c: (gdk_pixbuf__jpeg_image_load),
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 2c98d63c4a..13a4c66e69 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -917,8 +917,10 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
                                           error,
                                           png_simple_error_callback,
                                           png_simple_warning_callback);
-
-       g_return_val_if_fail (png_ptr != NULL, FALSE);
+       if (png_ptr == NULL) {
+	       success = FALSE;
+	       goto cleanup;
+       }
 
        info_ptr = png_create_info_struct (png_ptr);
        if (info_ptr == NULL) {