diff --git a/ChangeLog b/ChangeLog
index d5971eaff5..9affd63461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/base/tile-manager.c (tile_manager_new): g_return_if_fail()
+	on width, height or bpp <= 0. Doesn't fix anything but badly
+	warns (and helps debugging) on bug #138117.
+
 2004-03-25  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimpvectortool.c (gimp_vector_tool_button_release):
diff --git a/app/base/tile-manager.c b/app/base/tile-manager.c
index 4323ca1b2f..456abe669e 100644
--- a/app/base/tile-manager.c
+++ b/app/base/tile-manager.c
@@ -46,6 +46,10 @@ tile_manager_new (gint toplevel_width,
   gint         width;
   gint         height;
 
+  g_return_val_if_fail (toplevel_width > 0, NULL);
+  g_return_val_if_fail (toplevel_height > 0, NULL);
+  g_return_val_if_fail (bpp  > 0, NULL);
+
   tm = g_new0 (TileManager, 1);
 
   width  = toplevel_width;