diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java
index 7cd4368f..90b4c21e 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java
+++ b/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java
@@ -30,16 +30,20 @@ public class CommandStartDungeonCreation extends CommandBase
 		int x = (int) player.posX;
 		int y = (int) player.posY;
 		int z = (int) player.posZ;
+		
+		if(!player.worldObj.isRemote)
+		{
 
-		LinkData link = new LinkData(player.worldObj.provider.dimensionId, 0, x, y+1, z, x, y+1, z, true, 3);
+			LinkData link = new LinkData(player.worldObj.provider.dimensionId, 0, x, y+1, z, x, y+1, z, true, 3);
 		
-		link = dimHelper.instance.createPocket(link,true, false);
+			link = dimHelper.instance.createPocket(link,true, false);
 		
-		dimHelper.instance.teleportToPocket(player.worldObj, link, player);
+			dimHelper.instance.teleportToPocket(player.worldObj, link, player);
 		
-		customDungeonImporter.customDungeonStatus.put(player.worldObj.provider.dimensionId, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID));
+			customDungeonImporter.customDungeonStatus.put(player.worldObj.provider.dimensionId, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID));
 		
-		this.getCommandSenderAsPlayer(var1).sendChatToPlayer("DimID = "+ link.destDimID);
+			this.getCommandSenderAsPlayer(var1).sendChatToPlayer("DimID = "+ link.destDimID);
+		}
 	
 	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java
index b9b33029..96ebfbe5 100644
--- a/StevenDimDoors/mod_pocketDim/dimHelper.java
+++ b/StevenDimDoors/mod_pocketDim/dimHelper.java
@@ -310,7 +310,10 @@ public class dimHelper extends DimensionManager
 	 */
 	public void teleportToPocket(World world,LinkData linkData, Entity entity)
 	{
-		
+		if(world.isRemote)
+		{
+			return;
+		}
 		
 
 		if(linkData!=null)