diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 9817b9e07a..d7d9bb4cc5 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -749,9 +749,12 @@ static BOOL CRYPT_ValueToRDN(DWORD dwCertEncodingType, PCERT_NAME_INFO info,
             ret = CRYPT_EncodeValue(dwCertEncodingType, value,
              &info->rgRDN[info->cRDN].rgRDNAttr[0].Value, types, ppszError);
         }
-    }
-    if (ret)
+        else
+            SetLastError(ERROR_OUTOFMEMORY);
         info->cRDN++;
+    }
+    else
+        SetLastError(ERROR_OUTOFMEMORY);
     return ret;
 }