diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
index 12cea5b5e0..cbf6e42eb1 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
@@ -238,11 +238,14 @@ public void queueDelete(Location l, boolean destroy) {
 
     @ParametersAreNonnullByDefault
     public void queueDelete(Collection<Location> locations, boolean destroy) {
-        Map<Location, Boolean> toDelete = new HashMap<>(locations.size());
+        Validate.notNull(locations, "Locations must not be null");
+
+        Map<Location, Boolean> toDelete = new HashMap<>(locations.size(), 1.0F);
         for (Location location : locations) {
+            Validate.notNull(location, "Locations must not contain null locations");
             toDelete.put(location, destroy);
         }
-        queueDelete(toDelete);
+        deletionQueue.putAll(toDelete);
     }
 
     @ParametersAreNonnullByDefault
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index decfbc9c3a..cf0955bcd6 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -621,7 +621,8 @@ public static void clearAllBlockInfoAtChunk(World world, int chunkX, int chunkZ,
             return;
         }
         Map<Location, Boolean> toClear = new HashMap<>();
-        for (Location location : blockStorage.storage.keySet()) {
+        Map<Location, Config> storage = blockStorage.getRawStorage();
+        for (Location location : storage.keySet()) {
             if (location.getBlockX() >> 4 == chunkX && location.getBlockZ() >> 4 == chunkZ) {
                 toClear.put(location, destroy);
             }