diff --git a/ChangeLog b/ChangeLog
index d87d649355..913cb0439d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-15  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpimagemaptool.c (gimp_image_map_tool_preview):
+	don't call map() if image_map_tool->image_map is NULL.
+
 2008-01-14  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/tools-utils.[ch]
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index 18b44159e2..011ea547b3 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -637,7 +637,7 @@ gimp_image_map_tool_preview (GimpImageMapTool *image_map_tool)
   tool    = GIMP_TOOL (image_map_tool);
   options = GIMP_IMAGE_MAP_TOOL_GET_OPTIONS (tool);
 
-  if (options->preview)
+  if (options->preview && image_map_tool->image_map)
     {
       gimp_tool_control_set_preserve (tool->control, TRUE);