diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp
index 413e39c..7220b43 100644
--- a/redfish-core/lib/update_service.hpp
+++ b/redfish-core/lib/update_service.hpp
@@ -601,6 +601,8 @@
                     return;
                 }
 
+                // Ensure we find our input swId, otherwise return an error
+                bool found = false;
                 for (const std::pair<
                          std::string,
                          std::vector<
@@ -617,6 +619,7 @@
                         continue;
                     }
 
+                    found = true;
                     fw_util::getFwStatus(asyncResp, swId, obj.second[0].first);
 
                     crow::connections::systemBus->async_method_call(
@@ -706,6 +709,14 @@
                         "org.freedesktop.DBus.Properties", "GetAll",
                         "xyz.openbmc_project.Software.Version");
                 }
+                if (!found)
+                {
+                    BMCWEB_LOG_ERROR << "Input swID " + *swId + " not found!";
+                    messages::resourceMissingAtURI(
+                        asyncResp->res,
+                        "/redfish/v1/UpdateService/FirmwareInventory/" + *swId);
+                    return;
+                }
             },
             "xyz.openbmc_project.ObjectMapper",
             "/xyz/openbmc_project/object_mapper",