diff --git a/agent/command.c b/agent/command.c
index 2fd9a85d4..b152a5ea4 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1458,7 +1458,9 @@ cmd_readkey (assuan_context_t ctx, char *line)
         goto leave;
 
       rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
-      if (!rc)
+      if (rc)
+        goto leave;
+      else
         {
           if (opt_format_ssh)
             {