diff --git a/utils.cpp b/utils.cpp
index 24d7b4c..8b33305 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -12,31 +12,38 @@
 namespace vpd
 {
 using namespace openpower::vpd::constants;
+using namespace inventory;
+using namespace phosphor::logging;
+
 namespace inventory
 {
 
-auto getPIMService()
+std::string getService(sdbusplus::bus::bus& bus, const std::string& path,
+                       const std::string& interface)
 {
-    auto bus = sdbusplus::bus::new_default();
-    auto mapper =
-        bus.new_method_call("xyz.openbmc_project.ObjectMapper",
-                            "/xyz/openbmc_project/object_mapper",
-                            "xyz.openbmc_project.ObjectMapper", "GetObject");
-
-    mapper.append(pimPath);
-    mapper.append(std::vector<std::string>({pimIntf}));
-
-    auto result = bus.call(mapper);
-    if (result.is_method_error())
-    {
-        throw std::runtime_error("ObjectMapper GetObject failed");
-    }
+    auto mapper = bus.new_method_call(mapperDestination, mapperObjectPath,
+                                      mapperInterface, "GetObject");
+    mapper.append(path, std::vector<std::string>({interface}));
 
     std::map<std::string, std::vector<std::string>> response;
-    result.read(response);
+    try
+    {
+        auto reply = bus.call(mapper);
+        reply.read(response);
+    }
+    catch (const sdbusplus::exception::SdBusError& e)
+    {
+        log<level::ERR>("D-Bus call exception",
+                        entry("OBJPATH=%s", mapperObjectPath),
+                        entry("INTERFACE=%s", mapperInterface),
+                        entry("EXCEPTION=%s", e.what()));
+
+        throw std::runtime_error("Service name is not found");
+    }
+
     if (response.empty())
     {
-        throw std::runtime_error("ObjectMapper GetObject bad response");
+        throw std::runtime_error("Service name response is empty");
     }
 
     return response.begin()->first;
@@ -44,12 +51,10 @@
 
 void callPIM(ObjectMap&& objects)
 {
-    std::string service;
-
     try
     {
-        service = getPIMService();
         auto bus = sdbusplus::bus::new_default();
+        auto service = getService(bus, pimPath, pimIntf);
         auto pimMsg =
             bus.new_method_call(service.c_str(), pimPath, pimIntf, "Notify");
         pimMsg.append(std::move(objects));
@@ -174,5 +179,27 @@
     }
     return propVal;
 }
+
+void createPEL(const std::map<std::string, std::string>& additionalData,
+               const std::string& errIntf)
+{
+    try
+    {
+        auto bus = sdbusplus::bus::new_default();
+
+        auto service = getService(bus, loggerObjectPath, loggerCreateInterface);
+        auto method = bus.new_method_call(service.c_str(), loggerObjectPath,
+                                          loggerCreateInterface, "Create");
+
+        method.append(errIntf, "xyz.openbmc_project.Logging.Entry.Level.Error",
+                      additionalData);
+        auto resp = bus.call(method);
+    }
+    catch (const sdbusplus::exception::SdBusError& e)
+    {
+        throw std::runtime_error(
+            "Error in invoking D-Bus logging create interface to register PEL");
+    }
+}
 } // namespace vpd
 } // namespace openpower
