diff --git a/ChangeLog b/ChangeLog
index 137587f188..2963c152b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-03  Michael Natterer  <mitch@gimp.org>
+
+	* app/core/gimpdatafactory.c (gimp_data_factory_load_data): check
+	for errors even if the loader_func returned something so we
+	display errors from partially loaded files which contain multiple
+	data items.
+
 2007-06-03  Michael Natterer  <mitch@gimp.org>
 
 	* libgimpwidgets/gimpcolorscale.c: let mouse button 1 jump to the
diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c
index 7533257eab..3b972d7caa 100644
--- a/app/core/gimpdatafactory.c
+++ b/app/core/gimpdatafactory.c
@@ -721,7 +721,8 @@ gimp_data_factory_load_data (const GimpDatafileData *file_data,
 
             g_list_free (data_list);
           }
-        else
+
+        if (G_UNLIKELY (error))
           {
             gimp_message (factory->gimp, NULL, GIMP_MESSAGE_ERROR,
                           _("Failed to load data:\n\n%s"), error->message);