diff --git a/src/multinodecommands.cpp b/src/multinodecommands.cpp
index d55b2f0..20a1841 100644
--- a/src/multinodecommands.cpp
+++ b/src/multinodecommands.cpp
@@ -67,6 +67,13 @@
             value = static_cast<uint8_t>(NodeRole::slave);
         else if (valueStr == "arbitrating")
             value = static_cast<uint8_t>(NodeRole::arbitrating);
+        else
+        {
+            phosphor::logging::log<phosphor::logging::level::ERR>(
+                "getMultiNodeRole: Invalid dbus value!",
+                phosphor::logging::entry("VALUE=%s", valueStr.c_str()));
+            return std::nullopt;
+        }
         return value;
     }
     catch (const std::exception& e)
diff --git a/src/smbiosmdrv2handler.cpp b/src/smbiosmdrv2handler.cpp
index ea4a794..55cd79a 100644
--- a/src/smbiosmdrv2handler.cpp
+++ b/src/smbiosmdrv2handler.cpp
@@ -872,7 +872,7 @@
 
 bool MDRV2::smbiosUnlock(uint8_t index)
 {
-    bool ret;
+    bool ret = false;
     switch (smbiosDir.dir[index].stage)
     {
         case MDR2SMBIOSStatusEnum::mdr2Updating: