diff --git a/src/engine/devcmd/cmds/FillCmd.java b/src/engine/devcmd/cmds/FillCmd.java
index 7c3c6efd..4d0b5ed4 100644
--- a/src/engine/devcmd/cmds/FillCmd.java
+++ b/src/engine/devcmd/cmds/FillCmd.java
@@ -70,7 +70,8 @@ public class FillCmd extends AbstractDevCmd {
 
         city = building.getCity();
 
-        if (city == null || city.warehouse == null || city.warehouse.building != building) {
+        if (city == null || city.warehouse == null || city.warehouse.building == null
+                || city.warehouse.building.getObjectUUID() != building.getObjectUUID()) {
             throwbackError(pc, "Selected warehouse is not the active warehouse of a city");
             return;
         }