diff --git a/vpd-manager/include/utility/dbus_utility.hpp b/vpd-manager/include/utility/dbus_utility.hpp
index df57cd1..c155d0c 100644
--- a/vpd-manager/include/utility/dbus_utility.hpp
+++ b/vpd-manager/include/utility/dbus_utility.hpp
@@ -267,11 +267,10 @@
     {
         for (const auto& l_objectKeyValue : objectMap)
         {
-            auto l_nodeHandle = objectMap.extract(l_objectKeyValue.first);
-
-            if (l_nodeHandle.key().str.find(constants::pimPath, 0) !=
+            if (l_objectKeyValue.first.str.find(constants::pimPath, 0) !=
                 std::string::npos)
             {
+                auto l_nodeHandle = objectMap.extract(l_objectKeyValue.first);
                 l_nodeHandle.key() = l_nodeHandle.key().str.replace(
                     0, std::strlen(constants::pimPath), "");
                 objectMap.insert(std::move(l_nodeHandle));