Index: base/applications/cmdutils/reg/reg.c
===================================================================
--- base/applications/cmdutils/reg/reg.c	(revision 71259)
+++ base/applications/cmdutils/reg/reg.c	(working copy)
@@ -478,7 +478,8 @@
             &maxValue, NULL, NULL, NULL);
         if (rc != ERROR_SUCCESS)
         {
-            /* FIXME: failure */
+            /* Failure */
+            output_message(STRING_CANNOT_FIND);
             RegCloseKey(subkey);
             return 1;
         }
@@ -499,7 +500,11 @@
         }
         if (rc != ERROR_SUCCESS)
         {
-            /* FIXME  delete failed */
+            /* Delete failed */
+            output_message(STRING_CANNOT_FIND);
+            RegCloseKey(subkey);
+            HeapFree(GetProcessHeap(), 0, szValue);
+            return 1;
         }
     }
     else if (value_name)