diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java
index 2b27372b..ea2712da 100644
--- a/src/engine/gameManager/BuildingManager.java
+++ b/src/engine/gameManager/BuildingManager.java
@@ -329,12 +329,16 @@ public enum BuildingManager {
         }
 
         // Clear all workorders for this hireling
-        if (hireling.getObjectType().equals(GameObjectType.NPC))
-            if (ForgeManager.vendorWorkOrderLookup.contains(hireling))
-                for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hireling)) {
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (ForgeManager.vendorWorkOrderLookup.get(hirelingNPC) != null)
+                for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hirelingNPC)) {
                     workOrder.runCompleted = true;
                     DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder);
                 }
+        }
         // Remove hireling from building
 
         building.getHirelings().remove(hireling);