diff --git a/ChangeLog b/ChangeLog
index 2f9853a74f..25f05c3167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-27  Sven Neumann  <sven@gimp.org>
+
+	* libgimpbase/gimpmemsize.c (string_to_memsize): don't just crash
+	right away if the impossible happens.
+
 2007-10-27  Sven Neumann  <sven@gimp.org>
 
 	* app/dialogs/preferences-dialog.c (prefs_resolution_source_callback):
diff --git a/libgimpbase/gimpmemsize.c b/libgimpbase/gimpmemsize.c
index e680ec4730..6502559af6 100644
--- a/libgimpbase/gimpmemsize.c
+++ b/libgimpbase/gimpmemsize.c
@@ -244,10 +244,14 @@ string_to_memsize (const GValue *src_value,
 
   str = g_value_get_string (src_value);
 
-  if (! str || ! gimp_memsize_deserialize (str, &memsize))
-    g_warning ("Can't convert string to GimpMemsize.");
-
-  g_value_set_uint64 (dest_value, memsize);
+  if (str && gimp_memsize_deserialize (str, &memsize))
+    {
+      g_value_set_uint64 (dest_value, memsize);
+    }
+  else
+    {
+      g_warning ("Can't convert string to GimpMemsize.");
+    }
 }