diff --git a/ChangeLog b/ChangeLog
index c8e1771d25..413dbcc733 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-27  Sven Neumann  <sven@gimp.org>
+
+	* modules/cdisplay_lcms.c (cdisplay_lcms_configure): gracefully
+	handle a NULL config until we have fixed creation of color display
+	modules so that they always have a reference to GimpColorConfig.
+
 2005-06-27  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpcolordisplayeditor.c: dialog layout tweaks.
diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c
index f7d1ca6355..5f940276bc 100644
--- a/modules/cdisplay_lcms.c
+++ b/modules/cdisplay_lcms.c
@@ -271,6 +271,9 @@ cdisplay_lcms_configure (GimpColorDisplay *display)
   const gchar  *info;
   gint          row = 0;
 
+  if (! config)
+    return NULL;
+
   vbox = gtk_vbox_new (FALSE, 12);
 
   hbox = gtk_hbox_new (FALSE, 12);