diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index 5546886ce17..c6b197a1522 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -544,8 +544,8 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine,
             }
             else
             {
-                TRACE("Couldn't find issuer, aborting chain creation\n");
-                ret = FALSE;
+                TRACE("Couldn't find issuer, halting chain creation\n");
+                break;
             }
         }
         if (ret)
diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c
index 93bbe2c3775..83627e053fe 100644
--- a/dlls/crypt32/tests/chain.c
+++ b/dlls/crypt32/tests/chain.c
@@ -1583,7 +1583,7 @@ static ChainCheck chainCheckNoStore[] = {
      { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT |
        CERT_TRUST_IS_NOT_TIME_VALID, 0 },
      1, simpleStatus8NoStore },
-   TODO_CHAIN | TODO_ERROR | TODO_INFO },
+   TODO_INFO },
 };
 
 /* Wednesday, Oct 1, 2007 */