Index: sdk/tools/mkhive/registry.c
===================================================================
--- sdk/tools/mkhive/registry.c	(revision 71918)
+++ sdk/tools/mkhive/registry.c	(working copy)
@@ -576,6 +576,10 @@
                                 &ValueNameString,
                                 &ValueCell,
                                 &CellIndex);
+
+        if (!NT_SUCCESS(Status))
+            return ERROR_UNSUCCESSFUL;
+
     }
     else
     {
@@ -586,8 +590,6 @@
 
     // /**/HvReleaseCell(Hive, CellIndex);/**/
 
-    if (!NT_SUCCESS(Status))
-        return ERROR_UNSUCCESSFUL;
 
     /* Get size of the allocated cell (if any) */
     if (!(ValueCell->DataLength & CM_KEY_VALUE_SPECIAL_SIZE) &&