diff --git a/g10/keygen.c b/g10/keygen.c
index 0dfed63a7..bfbed0ebd 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -5041,6 +5041,8 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock, const char *algostr,
     err = agent_passwd (ctrl, hexgrip, desc, 1 /*=verify*/,
                         &cache_nonce, &passwd_nonce);
     xfree (desc);
+    if (err)
+      goto leave;
   }
 
   /* Start creation.  */