diff --git a/src/engine/devcmd/cmds/FillCmd.java b/src/engine/devcmd/cmds/FillCmd.java
index 4d0b5ed4..d665896a 100644
--- a/src/engine/devcmd/cmds/FillCmd.java
+++ b/src/engine/devcmd/cmds/FillCmd.java
@@ -56,7 +56,7 @@ public class FillCmd extends AbstractDevCmd {
             }
         }
 
-        if (!(target instanceof Building)) {
+        if (target == null || target.getObjectType() != mbEnums.GameObjectType.Building) {
             throwbackError(pc, "Select a warehouse");
             return;
         }