From 324d690eaf11f72a04b552ec3f96f15702243a90 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sun, 10 Jul 2016 00:00:23 +0100
Subject: [PATCH] fix unloading of null objects

---
 src/object/ObjectManager.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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++;
+                }
             }
         }