diff --git a/ChangeLog b/ChangeLog
index b47359de44..d7b898b038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-24  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+	* plug-ins/common/ripple.c: set min for "period" scale entry
+	to 1 instead of 0, and add error check for noninteractive.
+	Fixes bug #357431.
+	
 2006-09-24  Michael Natterer  <mitch@gimp.org>
 
 	* app/actions/context-commands.c: don't allow editing of read-only
diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c
index 7519c14c7e..0606bdb15d 100644
--- a/plug-ins/common/ripple.c
+++ b/plug-ins/common/ripple.c
@@ -197,6 +197,12 @@ run (const gchar      *name,
           rvals.antialias = (param[8].data.d_int32) ? TRUE : FALSE;
           rvals.tile = (param[9].data.d_int32) ? TRUE : FALSE;
 
+          if (rvals.period < 1)
+            {
+              gimp_message ("Ripple: period must be at least 1.\n");
+              status = GIMP_PDB_CALLING_ERROR;
+            }
+
           if (rvals.edges < SMEAR || rvals.edges > BLANK)
             status = GIMP_PDB_CALLING_ERROR;
         }
@@ -607,7 +613,7 @@ ripple_dialog (GimpDrawable *drawable)
   /*  Period  */
   scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
                                      _("_Period:"), SCALE_WIDTH, 0,
-                                     rvals.period, 0, 200, 1, 10, 0,
+                                     rvals.period, 1, 200, 1, 10, 0,
                                      TRUE, 0, 0,
                                      NULL, NULL);
   g_signal_connect (scale_data, "value-changed",