diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index e2909d7197834478b6694e5a1383c4fae3f307af..25e0eb90ebb716f24542f3d7ee4fa1636c7affbd 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -137,6 +137,9 @@ int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
     cbdata.number = number;
     cbdata.found = 0;
 
+    if (namemap == NULL)
+        return 0;
+
     /*
      * We collect all the names first under a read lock. Subsequently we call
      * the user function, so that we're not holding the read lock when in user