diff --git a/ChangeLog b/ChangeLog
index 5cdb8f4e24..e8742c5b46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-15  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimpcurve-save.c: added sanity checks.
+
 2007-11-15  Michael Natterer  <mitch@gimp.org>
 
 	* app/Makefile.am
diff --git a/app/core/gimpcurve-save.c b/app/core/gimpcurve-save.c
index 1e9eb52b35..7c853fa950 100644
--- a/app/core/gimpcurve-save.c
+++ b/app/core/gimpcurve-save.c
@@ -37,9 +37,14 @@ gboolean
 gimp_curve_save (GimpData  *data,
                  GError   **error)
 {
-  GimpCurve *curve = GIMP_CURVE (data);
+  GimpCurve *curve;
   FILE      *file;
 
+  g_return_val_if_fail (GIMP_IS_CURVE (data), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  curve = GIMP_CURVE (data);
+
   file = g_fopen (data->filename, "wb");
 
   if (! file)
@@ -51,7 +56,7 @@ gimp_curve_save (GimpData  *data,
       return FALSE;
     }
 
-  /* write  curve */
+  /* FIXME: write curve */
 
   fclose (file);