diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 835f197e2..d8e03e22d 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* io-tiff.c: Revert the last change, it was wrong
+	* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Redo the last
+	change in a different way.
+
 2007-07-04  Tor Lillqvist  <tml@novell.com>
 
 	* pixops/Makefile.am (timescale_LDADD): Use GDK_PIXBUF_DEP_LIBS
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 130608fb3..981874c08 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -723,8 +723,12 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
                         GError *tmp = NULL;
                         if (!priv->image_module->stop_load (priv->context, &tmp) || tmp)
                                 {
-                                        gdk_pixbuf_loader_ensure_error (loader, &tmp);
-					g_propagate_error (error, tmp);
+					/* don't call gdk_pixbuf_loader_ensure_error()
+ 					 * here, since we might not get an error in the
+ 					 * gdk_pixbuf_get_file_info() case
+ 					 */
+					if (tmp)
+						g_propagate_error (error, tmp);
                                         retval = FALSE;
                                 }
                 }
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index 9e521022d..a9863e6cf 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -199,13 +199,8 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error)
                 gint h = height;
 		(* context->size_func) (&w, &h, context->user_data);
                 
-                if (w == 0 || h == 0) {
-                    g_set_error (error,
-                                 GDK_PIXBUF_ERROR,
-                                 GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                                 _("Width or height of TIFF image is zero"));
+                if (w == 0 || h == 0)
                     return NULL;
-                }
         }
 
         pixels = g_try_malloc (bytes);