diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp
index 5b2d78e..a7243a0 100644
--- a/redfish-core/lib/storage.hpp
+++ b/redfish-core/lib/storage.hpp
@@ -953,8 +953,10 @@
                         matchAndFillDrive(asyncResp, chassisId, driveName,
                                           resp);
                     });
-                break;
+                return;
             }
+            // Couldn't find an object with that name.  return an error
+            messages::resourceNotFound(asyncResp->res, "Chassis", chassisId);
         });
 }