diff --git a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
index 7457b9f1c..ad54ebfaa 100644
--- a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
+++ b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
@@ -421,22 +421,27 @@ public class Mantle {
         }
 
         ioTrim.set(true);
-        //unloadLock.lock();
+        unloadLock.lock();
         try {
             Iris.debug("Trimming Tectonic Plates older than " + Form.duration(adjustedIdleDuration.get(), 0));
             if (lastUse != null) {
-                for (Long i : new ArrayList<>(lastUse.keySet())) {
-                    double finalAdjustedIdleDuration = adjustedIdleDuration.get();
-                    hyperLock.withLong(i, () -> {
-                        Long lastUseTime = lastUse.get(i);
-                        if (lastUseTime != null && M.ms() - lastUseTime >= finalAdjustedIdleDuration) {
-                            toUnload.add(i);
-                            Iris.debug("Tectonic Region added to unload");
-                        }
-                    });
+                if (!lastUse.isEmpty()) {
+                    for (Long i : new ArrayList<>(lastUse.keySet())) {
+                        double finalAdjustedIdleDuration = adjustedIdleDuration.get();
+                        hyperLock.withLong(i, () -> {
+                            Long lastUseTime = lastUse.get(i);
+                            if (lastUseTime != null && M.ms() - lastUseTime >= finalAdjustedIdleDuration) {
+                                toUnload.add(i);
+                                Iris.debug("Tectonic Region added to unload");
+                                Iris.panic();
+                            }
+                        });
+                    }
                 }
             }
 
+        } catch (Throwable e) {
+            Iris.reportError(e);
         } finally {
             ioTrim.set(false);
             unloadLock.unlock();