diff --git a/src/engine/net/client/handlers/DestroyBuildingHandler.java b/src/engine/net/client/handlers/DestroyBuildingHandler.java
index c79beb98..b60e2916 100644
--- a/src/engine/net/client/handlers/DestroyBuildingHandler.java
+++ b/src/engine/net/client/handlers/DestroyBuildingHandler.java
@@ -98,9 +98,12 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
                 return true;
 
             Warehouse.destroyedWarehouses.remove(building.getObjectUUID());
-            DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
 
-            city.warehouse = null;
+            // Rubble no longer owns city.warehouse, which may be null or a newly placed warehouse
+            if (city.warehouse != null && building.getRank() != -1) {
+                DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+                city.warehouse = null;
+            }
 
         }