diff --git a/scd/command.c b/scd/command.c
index c1cded6b1..5eb97fb20 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -736,6 +736,9 @@ cmd_readkey (assuan_context_t ctx, char *line)
   else
     rc = gpg_error (GPG_ERR_NO_SECKEY);
 
+  if (rc)
+    goto leave;
+
   if (opt_nokey)
     ;
   else if (advanced)