diff --git a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
index 515f63c0..b8bc48db 100644
--- a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java
@@ -532,6 +532,13 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
         }
 
+        // A rebuilt warehouse would orphan the destroyed warehouse's loot
+
+        if (cityObject.getBane() != null) {
+            PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Cannot place a warehouse during an active bane.");
+            return false;
+        }
+
         // Create the warehouse object and it's entry in the database
 
         if (createWarehouse(player, msg.getFirstPlacementInfo(), serverZone) == false) {