diff --git a/ChangeLog b/ChangeLog
index b755a1120f..4aedda7d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-06  Michael Natterer  <mitch@gimp.org>
+
+	* app/gegl/gimpoperationhuesaturation.c
+	(gimp_operation_hue_saturation_process): don't crash if there is
+	no config object.
+
 2008-02-06  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpimagemap.c (gimp_image_map_apply): when using a
diff --git a/app/gegl/gimpoperationhuesaturation.c b/app/gegl/gimpoperationhuesaturation.c
index c8aee31d43..62424d2061 100644
--- a/app/gegl/gimpoperationhuesaturation.c
+++ b/app/gegl/gimpoperationhuesaturation.c
@@ -127,15 +127,17 @@ gimp_operation_hue_saturation_process (GeglOperation *operation,
                                        void          *out_buf,
                                        glong          samples)
 {
-  GimpOperationPointFilter *point   = GIMP_OPERATION_POINT_FILTER (operation);
-  GimpHueSaturationConfig  *config  = GIMP_HUE_SATURATION_CONFIG (point->config);
-  gfloat                   *src     = in_buf;
-  gfloat                   *dest    = out_buf;
-  gfloat                    overlap = config->overlap / 2.0;
+  GimpOperationPointFilter *point  = GIMP_OPERATION_POINT_FILTER (operation);
+  GimpHueSaturationConfig  *config = GIMP_HUE_SATURATION_CONFIG (point->config);
+  gfloat                   *src    = in_buf;
+  gfloat                   *dest   = out_buf;
+  gfloat                    overlap;
 
   if (! config)
     return FALSE;
 
+  overlap = config->overlap / 2.0;
+
   while (samples--)
     {
       GimpRGB  rgb;