diff --git a/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java b/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java
index f420fb6..52d42a2 100644
--- a/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java
+++ b/src/main/java/de/lunarakai/minecleaner/MinecleanerArena.java
@@ -449,6 +449,7 @@ public class MinecleanerArena {
     }
 
     private void setBlockForCellType(int x, int y, Cell cell) {
+        if(cell.getType() == null) return;
         switch (cell.getType()) {
             case Empty: {
                 if (!cell.isRevealed() || !cell.isFlagged() || !cell.isExploded()) {