diff --git a/vpd-manager/oem-handler/ibm_handler.cpp b/vpd-manager/oem-handler/ibm_handler.cpp
index dcb0ddd..bd06a7f 100644
--- a/vpd-manager/oem-handler/ibm_handler.cpp
+++ b/vpd-manager/oem-handler/ibm_handler.cpp
@@ -755,8 +755,26 @@
         throw JsonException("System config JSON is empty", m_sysCfgJsonObj);
     }
 
+    uint16_t l_errCode = 0;
+    std::string l_systemVpdPath{SYSTEM_VPD_FILE_PATH};
+    commonUtility::getEffectiveFruPath(m_vpdCollectionMode, l_systemVpdPath,
+                                       l_errCode);
+
+    if (l_errCode)
+    {
+        throw std::runtime_error(
+            "Failed to get effective System VPD path, for [" + l_systemVpdPath +
+            "], reason: " + commonUtility::getErrCodeMsg(l_errCode));
+    }
+
     // parse system VPD
-    auto l_parsedVpdMap = m_worker->parseVpdFile(SYSTEM_VPD_FILE_PATH);
+    auto l_parsedVpdMap = m_worker->parseVpdFile(l_systemVpdPath);
+    if (std::holds_alternative<std::monostate>(l_parsedVpdMap))
+    {
+        throw std::runtime_error(
+            "System VPD parsing failed, from path [" + l_systemVpdPath +
+            "]. Either file doesn't exist or error occurred while parsing the file.");
+    }
 
     // Implies it is default JSON.
     std::string l_systemJson{JSON_ABSOLUTE_PATH_PREFIX};
@@ -770,7 +788,6 @@
             "No system JSON found corresponding to IM read from VPD.");
     }
 
-    uint16_t l_errCode = 0;
     // re-parse the JSON once appropriate JSON has been selected.
     m_sysCfgJsonObj = jsonUtility::getParsedJson(l_systemJson, l_errCode);