--- a/cinst/nssstore_win.c	Mon Jun 30 11:25:40 2014 +0200
+++ b/cinst/nssstore_win.c	Mon Jun 30 11:26:05 2014 +0200
@@ -583,6 +583,7 @@
         {
           /* This is somewhat expected if the registry is not located
              in the standard location. Failure is accepted in that case. */
+          SetLastError((DWORD)ret);
           PRINTLASTERROR ("Failed to load hive.");
           continue;
         }
@@ -609,7 +610,12 @@
         }
 
       RegCloseKey (key_handle);
-      RegUnLoadKey (HKEY_LOCAL_MACHINE, APPNAME L"_tmphive");
+      ret = RegUnLoadKeyW (HKEY_LOCAL_MACHINE, APPNAME L"_tmphive");
+      if (ret != ERROR_SUCCESS)
+        {
+          SetLastError ((DWORD)ret);
+          PRINTLASTERROR ("Failed to unload hive.");
+        }
     }
 
   xfree (run_command);