diff --git a/ntoskrnl/config/cmhvlist.c b/ntoskrnl/config/cmhvlist.c
index 8a4009303d8..b9ebb8fd4e6 100644
--- a/ntoskrnl/config/cmhvlist.c
+++ b/ntoskrnl/config/cmhvlist.c
@@ -178,7 +178,7 @@ CmpAddToHiveFileList(IN PCMHIVE Hive)
                                NULL,
                                0,
                                &Length);
-        if (Status != STATUS_BUFFER_TOO_SMALL)
+        if (Status != STATUS_INFO_LENGTH_MISMATCH)
         {
             DPRINT1("CmpAddToHiveFileList: Hive file name size query failed, status = 0x%08lx\n", Status);
             goto Quickie;
diff --git a/ntoskrnl/config/cmlazy.c b/ntoskrnl/config/cmlazy.c
index 93760766524..a8526e5b272 100644
--- a/ntoskrnl/config/cmlazy.c
+++ b/ntoskrnl/config/cmlazy.c
@@ -302,7 +302,7 @@ CmpCmdHiveOpen(IN POBJECT_ATTRIBUTES FileAttributes,
                                NULL,
                                0,
                                &Length);
-        if (Status != STATUS_BUFFER_TOO_SMALL)
+        if (Status != STATUS_INFO_LENGTH_MISMATCH)
         {
             DPRINT1("CmpCmdHiveOpen(): Root directory handle object name size query failed, Status = 0x%08lx\n", Status);
             return Status;