diff --git a/ChangeLog b/ChangeLog
index 0f67ea44c2..331b212ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-23  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimptooloptionseditor.c
+	(gimp_tool_options_editor_get_title): avoid the crash reported in
+	bug #470304.
+
 2007-09-23  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/lcms.c: marked blurbs as translatable.
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index 0439b19788..f302a2b38b 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -246,7 +246,7 @@ gimp_tool_options_editor_get_title (GimpDocked *docked)
 
   tool_info = gimp_context_get_tool (context);
 
-  return g_strdup (tool_info->blurb);
+  return tool_info ? g_strdup (tool_info->blurb) : NULL;
 }