diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
index 223f1f2..e47c66e 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/CommandCore.java
@@ -16,6 +16,7 @@ import net.minecraft.network.packet.c2s.play.UpdateCommandBlockC2SPacket;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.dimension.DimensionType;
 
 import java.util.Timer;
@@ -162,7 +163,11 @@ public class CommandCore {
     }
 
     public void refill () {
-        if (!runFillCommand || withPos == null) return;
+        if (!runFillCommand || client.world == null || withPos == null) return;
+
+        final Chunk chunk = client.world.getChunk(withPos.getCenter());
+
+        if (chunk == null) return;
 
         final String command = String.format(
                 "fill %s %s %s %s %s %s command_block",