diff --git a/src/object/ObjectManager.cpp b/src/object/ObjectManager.cpp index 8db4fdf1f8..49eed6bdf9 100644 --- a/src/object/ObjectManager.cpp +++ b/src/object/ObjectManager.cpp @@ -157,10 +157,13 @@ public: if (ori != nullptr) { Object * loadedObject = ori->LoadedObject; - size_t index = GetLoadedObjectIndex(loadedObject); - - UnloadObject(loadedObject); - numObjectsUnloaded++; + if (loadedObject != nullptr) + { + size_t index = GetLoadedObjectIndex(loadedObject); + + UnloadObject(loadedObject); + numObjectsUnloaded++; + } } }