diff --git a/src/items/containers/container.cpp b/src/items/containers/container.cpp
index 5d91f20684a..b344a48e091 100644
--- a/src/items/containers/container.cpp
+++ b/src/items/containers/container.cpp
@@ -776,6 +776,14 @@ void Container::updateThing(const std::shared_ptr<Thing> &thing, uint16_t itemId
 }
 
 void Container::replaceThing(uint32_t index, const std::shared_ptr<Thing> &thing) {
+	if (!thing) {
+		return;
+	}
+
+	if (index >= itemlist.size()) {
+		return;
+	}
+
 	const auto &item = thing->getItem();
 	if (!item) {
 		return /*RETURNVALUE_NOTPOSSIBLE*/;