diff --git a/Iris.iml b/Iris.iml
index 74f3f131c..f54c3d5a6 100644
--- a/Iris.iml
+++ b/Iris.iml
@@ -1,2 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <conelement value="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
+    <src_description expected_position="2">
+      <src_folder value="file://$MODULE_DIR$/src/main/java" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/src/main/resources" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/src/test/java" expected_position="4" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="JavaSE-1.8" jdkType="JavaSDK" />
+    <orderEntry type="library" name="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" level="application" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
index 249efab0a..cf7bfedb1 100644
--- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
+++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
@@ -614,12 +614,14 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
     @Override
     public void close() {
         J.car(art);
-        getComposite().close();
+        if (getComposite() != null) {
+            getComposite().close();
 
-        if(isStudio())
-        {
-            IrisWorlds.evacuate(getComposite().getWorld());
-            Bukkit.unloadWorld(getComposite().getWorld(), !isStudio());
+
+            if (isStudio()) {
+                IrisWorlds.evacuate(getComposite().getWorld());
+                Bukkit.unloadWorld(getComposite().getWorld(), !isStudio());
+            }
         }
     }