diff --git a/ChangeLog b/ChangeLog
index 3524bc473f..4719b8736e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-23  Lars-Peter Clausen  <lars@metafoo.de>
+
+	Merged from trunk:
+
+	* app/core/gimpgradient.c (gimp_gradient_segment_range_delete):
+	Don't dereference final_start_seg and final_end_seg if NULL.
+
 2008-08-23  Lars-Peter Clausen  <lars@metafoo.de>
 
 	Merged from trunk:
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
index 60797216f1..1783d93326 100644
--- a/app/core/gimpgradient.c
+++ b/app/core/gimpgradient.c
@@ -1682,8 +1682,10 @@ gimp_gradient_segment_range_delete (GimpGradient         *gradient,
   return;
 
  premature_return:
-  *final_start_seg = start_seg;
-  *final_end_seg   = end_seg;
+  if (final_start_seg)
+    *final_start_seg = start_seg;
+  if (final_end_seg)
+    *final_end_seg = end_seg;
 }
 
 void