diff --git a/agent/ChangeLog b/agent/ChangeLog
index cd781e257..e8570f7a4 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-17  Ben Kibbey <bjk@luxsci.net>
+
+	* command.c (cmd_passwd): Check for an error before presetting.
+
 2011-04-12  Ben Kibbey <bjk@luxsci.net>
 
 	* command.c (cmd_passwd): Fixed --preset when not previously cached.
diff --git a/agent/command.c b/agent/command.c
index d2ed23a67..9f45afbb0 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1530,7 +1530,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
                 }
             }
         }
-      if (opt_preset)
+      if (!err && opt_preset)
       {
 	  char hexgrip[40+1];
 	  bin2hex(grip, 20, hexgrip);