diff --git a/sm/minip12.c b/sm/minip12.c
index 1b5986f7e..84f5dbecb 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -1662,6 +1662,7 @@ parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
   if (!datalen)
     {
       err = gpg_error (GPG_ERR_DECRYPT_FAILED);
+      ctx->badpass = 1;  /* This is the most likley reason.  */
       goto bailout;
     }
 
@@ -2187,6 +2188,7 @@ parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx, struct tlv_ctx_s *tlv)
   if (!datalen)
     {
       err = gpg_error (GPG_ERR_DECRYPT_FAILED);
+      ctx->badpass = 1;
       goto bailout;
     }