diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
index 26237bf2..8dda9592 100644
--- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
@@ -393,6 +393,11 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
         WorkOrder workOrder = ForgeManager.itemWorkOrderLookup.get(virtualItem);
 
         City city = workOrder.vendor.building.getCity();
+
+        if (city == null)
+            return;
+        ;
+
         city.transactionLock.writeLock().lock();
 
         try {