diff --git a/build.gradle b/build.gradle
index 4c40b412d..17b8fbe11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.volmit.iris'
-version '1.5.7'
+version '1.5.8'
 def apiVersion = '1.17'
 def name = 'Iris'
 def main = 'com.volmit.iris.Iris'
diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java
index d67973288..05f892d8b 100644
--- a/src/main/java/com/volmit/iris/Iris.java
+++ b/src/main/java/com/volmit/iris/Iris.java
@@ -558,10 +558,9 @@ public class Iris extends VolmitPlugin implements Listener {
     }
 
     public boolean isMCA() {
-        return IrisSettings.get().getGenerator().isMcaPregenerator();
+        return !IrisSettings.get().getGenerator().isDisableMCA();
     }
 
-
     public static void reportErrorChunk(int x, int z, Throwable e, String extra) {
         if (IrisSettings.get().getGeneral().isDebug()) {
             File f = instance.getDataFile("debug", "chunk-errors", "chunk."+ x + "." + z + ".txt");
diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java
index 84c583a9f..4849c9d76 100644
--- a/src/main/java/com/volmit/iris/core/IrisSettings.java
+++ b/src/main/java/com/volmit/iris/core/IrisSettings.java
@@ -108,7 +108,7 @@ public class IrisSettings {
     public static class IrisSettingsGenerator {
 
         public String defaultWorldType = "overworld";
-        public boolean mcaPregenerator = false;
+        public boolean disableMCA = false;
         public boolean systemEffects = true;
         public boolean systemEntitySpawnOverrides = true;
         public boolean systemEntityInitialSpawns = true;
diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java
index bd843feb5..3aa88638f 100644
--- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java
+++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java
@@ -42,7 +42,7 @@ public class HybridPregenMethod implements PregeneratorMethod {
     }
 
     private boolean supportsHeadless(World world) {
-        return IrisWorlds.access(world) != null && IrisSettings.get().getGenerator().isMcaPregenerator();
+        return IrisWorlds.access(world) != null && !IrisSettings.get().getGenerator().isDisableMCA();
     }
 
     @Override
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java
index 8dfe7b381..a28570bac 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java
@@ -68,6 +68,11 @@ public class IrisObjectRotation {
     }
 
     public IrisObject rotateCopy(IrisObject e) {
+        if(e == null)
+        {
+            return null;
+        }
+
         return e.rotateCopy(this);
     }