diff --git a/common/t-recsel.c b/common/t-recsel.c
index 679ea7aff..6ee8bed84 100644
--- a/common/t-recsel.c
+++ b/common/t-recsel.c
@@ -388,7 +388,6 @@ run_test_2 (void)
 
   FREEEXPR();
   ADDEXPR ("letters -f");
-  recsel_dump (se);
   if (!recsel_select (se, test_2_getval, NULL))
     fail (0, 0);
   FREEEXPR();
diff --git a/sm/verify.c b/sm/verify.c
index cd9659313..3c22ee0cc 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -301,12 +301,14 @@ gpgsm_verify (ctrl_t ctrl, estream_t in_fp, estream_t data_fp,
       unsigned int pkalgoflags, verifyflags;
 
       rc = ksba_cms_get_issuer_serial (cms, signer, &issuer, &serial);
-      if (!signer && gpg_err_code (rc) == GPG_ERR_NO_DATA
-          && !data_fp && is_detached)
+      if (!signer && gpg_err_code (rc) == GPG_ERR_NO_DATA)
         {
           log_info ("certs-only message accepted\n");
-          rc = 0;
-          break;
+          if (!data_fp && is_detached)
+            {
+              rc = 0;
+              break;
+            }
         }
       if (rc)
         {