diff --git a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
index d8003f5..a74c365 100644
--- a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
@@ -99,7 +99,17 @@
 	public void initializeConnectionToPlayer(NetworkManager par1INetworkManager, EntityPlayerMP par2EntityPlayerMP, NetHandlerPlayServer nethandlerplayserver)
 	{
 		NBTTagCompound nbttagcompound = this.readPlayerDataFromFile(par2EntityPlayerMP);
-		par2EntityPlayerMP.setWorld(this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension));
+		
+		World playerWorld = this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension);
+		if (playerWorld==null)
+		{
+			par2EntityPlayerMP.dimension=0;
+			playerWorld=this.mcServer.worldServerForDimension(0);
+			ChunkCoordinates spawnPoint = playerWorld.provider.getRandomizedSpawnPoint();
+			par2EntityPlayerMP.setPosition(spawnPoint.posX, spawnPoint.posY, spawnPoint.posZ);
+		}
+		
+		par2EntityPlayerMP.setWorld(playerWorld);
 		par2EntityPlayerMP.theItemInWorldManager.setWorld((WorldServer)par2EntityPlayerMP.worldObj);
 		String s = "local";
 
diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties
index 9fe4d5f..f91c498 100644
--- a/src/main/resources/fmlversion.properties
+++ b/src/main/resources/fmlversion.properties
@@ -1,6 +1,6 @@
 fmlbuild.major.number=7
 fmlbuild.minor.number=2
 fmlbuild.revision.number=211
-fmlbuild.build.number=30
+fmlbuild.build.number=31
 fmlbuild.mcversion=1.7.2
 fmlbuild.mcpversion=9.03