diff --git a/ChangeLog b/ChangeLog
index bc312738d9..7f40a5a1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-05  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/curve_bend.c: applied a patch from Henrik Brix
+	Andersen that tells the user that Curve Bend cannot operate on
+	layers with masks instead of silently applying the mask
+	(bug #134748).
+
 2004-06-05  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/plugin-defs.pl
diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c
index 7ecf124ecd..9d9c949d08 100644
--- a/plug-ins/common/curve_bend.c
+++ b/plug-ins/common/curve_bend.c
@@ -721,7 +721,15 @@ run (const gchar      *name,
        *   some transitions (especially rotate) cant operate proper on
        *   layers with masks !
        */
-      gimp_layer_remove_mask (l_layer_id, 0 /* 0==APPLY */ );
+      if (run_mode == GIMP_RUN_NONINTERACTIVE)
+        {
+          gimp_layer_remove_mask (l_layer_id, 0 /* 0==APPLY */ );
+        }
+      else
+        {
+          g_message (_("Cannot operate on layers with masks."));
+          status = GIMP_PDB_EXECUTION_ERROR;
+        }
     }
 
   /* if there is a selection, make it the floating selection layer */