diff --git a/vpd_tool.cpp b/vpd_tool.cpp
index ebb7917..893b652 100644
--- a/vpd_tool.cpp
+++ b/vpd_tool.cpp
@@ -141,6 +141,7 @@
     catch (const exception& e)
     {
         cerr << e.what();
+        rc = -1;
     }
 
     return rc;
diff --git a/vpd_tool_impl.cpp b/vpd_tool_impl.cpp
index 8453ce2..9232121 100644
--- a/vpd_tool_impl.cpp
+++ b/vpd_tool_impl.cpp
@@ -477,8 +477,8 @@
     returnCode = system(invManagerRestart.c_str());
     printReturnCode(returnCode);
 
-    string sysVpdStop = "systemctl stop system-vpd.service";
-    returnCode = system(sysVpdStop.c_str());
+    string sysVpdRestart = "systemctl restart system-vpd.service";
+    returnCode = system(sysVpdRestart.c_str());
     printReturnCode(returnCode);
 
     string udevAdd = "udevadm trigger -c add -s \"*nvmem*\" -v";