diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java
index f69edd88..260f66cd 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java
+++ b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java
@@ -27,12 +27,13 @@ public class CommandEndDungeonCreation extends CommandBase
 		
 		if(!customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId))
 		{
-			if(var2.length==0)
+			if(var2.length<2)
 			{
 				player.sendChatToPlayer("Must have started dungeon creation, use argument OVERRIDE to export anyway");
 				return;
 
 			}
+		
 			else if(!var2[1].contains("OVERRIDE"))
 			{
 				player.sendChatToPlayer("Must have started dungeon creation, use argument OVERRIDE to export anyway");
@@ -56,8 +57,11 @@ public class CommandEndDungeonCreation extends CommandBase
 			player.sendChatToPlayer("created dungeon schematic in " +mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic");
 			mod_pocketDim.customDungeons.add(newDungeon);
 			
-			dimHelper.instance.teleportToPocket(player.worldObj, customDungeonImporter.customDungeonStatus.get(player.worldObj.provider.dimensionId), player);
+			if(customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId))
+			{
+				dimHelper.instance.teleportToPocket(player.worldObj, customDungeonImporter.customDungeonStatus.get(player.worldObj.provider.dimensionId), player);
 
+			}
 		}
 
 		
diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java
index 126ce5f7..c6f3b049 100644
--- a/StevenDimDoors/mod_pocketDim/dimHelper.java
+++ b/StevenDimDoors/mod_pocketDim/dimHelper.java
@@ -1081,7 +1081,6 @@ public class dimHelper extends DimensionManager
 		         new File(this.getCurrentSaveRootDirectory()+"/DimensionalDoorsData").renameTo(new File(this.getCurrentSaveRootDirectory()+"/DimensionalDoorsDataOLD"));
 		         
 		        new File(saveFileName).renameTo( new File(this.getCurrentSaveRootDirectory()+"/DimensionalDoorsData"));
-		        // System.out.println(String.valueOf(this.dimensionList));
 			}
 			catch(Exception e)
 			{