diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index b79fd03..49911f3 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -1129,14 +1129,14 @@
     // Get the Message from the MessageRegistry
     const registries::Message* message = registries::getMessage(messageID);
 
-    std::string msg;
-    std::string severity;
-    if (message != nullptr)
+    if (message == nullptr)
     {
-        msg = message->message;
-        severity = message->messageSeverity;
+        BMCWEB_LOG_WARNING << "Log entry not found in registry: " << logEntry;
+        return 0;
     }
 
+    std::string msg = message->message;
+
     // Get the MessageArgs from the log if there are any
     std::span<std::string> messageArgs;
     if (logEntryFields.size() > 1)
@@ -1186,7 +1186,7 @@
         {"MessageId", std::move(messageID)},
         {"MessageArgs", messageArgs},
         {"EntryType", "Event"},
-        {"Severity", std::move(severity)},
+        {"Severity", message->messageSeverity},
         {"Created", std::move(timestamp)}};
     return 0;
 }