diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 14819a3..0c0b841 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -461,7 +461,7 @@
 				crashreport = this.addServerInfoToCrashReport(new CrashReport("Exception in server tick loop", throwable1));
 			}
 
-			File file1 = new File(new File(this.getDataDirectory(), "crash-reports"), "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-server.txt");
+			File file1 = new File(new File(this.getHomeDirectory(), "crash-reports"), "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-server.txt");
 
 			if (crashreport.saveToFile(file1))
 			{
@@ -1502,4 +1502,9 @@
 	{
 		return anvilFile;
 	}
+	
+	protected File getHomeDirectory()
+	{
+		return getDataDirectory();
+	}
 }
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 781ef87..80af2a9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -1,6 +1,7 @@
 package net.minecraft.server.dedicated;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.FMLLaunchHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -583,6 +584,11 @@
 	
 	protected File getDataDirectory()
 	{
-		return ConfigurationHandler.getSettingDir();
+		return ConfigurationHandler.getStorageDir();
+	}
+	
+	protected File getHomeDirectory()
+	{
+		return FMLLaunchHandler.getMinecraftHome();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/management/UserList.java b/src/main/java/net/minecraft/server/management/UserList.java
index aad392d..9b96aba 100644
--- a/src/main/java/net/minecraft/server/management/UserList.java
+++ b/src/main/java/net/minecraft/server/management/UserList.java
@@ -187,6 +187,9 @@
 	@SideOnly(Side.SERVER)
 	public void func_152679_g() throws IOException
 	{
+		if(!field_152695_c.exists())
+			return; //Без лишних исключений при старте сервера
+		
 		Collection collection = null;
 		BufferedReader bufferedreader = null;
 
diff --git a/src/main/java/org/ultramine/server/ConfigurationHandler.java b/src/main/java/org/ultramine/server/ConfigurationHandler.java
index c38c896..311ae18 100644
--- a/src/main/java/org/ultramine/server/ConfigurationHandler.java
+++ b/src/main/java/org/ultramine/server/ConfigurationHandler.java
@@ -19,6 +19,7 @@
 	public static Logger log = LogManager.getLogger();
 	
 	private static File settingsDir = new File(FMLLaunchHandler.getMinecraftHome(), "settings");
+	private static File storageDir = new File(FMLLaunchHandler.getMinecraftHome(), "storage");
 	private static File worldsDir = new File(FMLLaunchHandler.getMinecraftHome(), "worlds");
 	
 	private static File serverConfigFile = new File(getSettingDir(), "server.yml");
@@ -30,6 +31,7 @@
 	static
 	{
 		if(!settingsDir.exists()) settingsDir.mkdir();
+		if(!storageDir.exists()) storageDir.mkdir();
 		if(!worldsDir.exists()) worldsDir.mkdir();
 	}
 	
@@ -54,6 +56,11 @@
 		return settingsDir;
 	}
 	
+	public static File getStorageDir()
+	{
+		return storageDir;
+	}
+	
 	public static File getWorldsDir()
 	{
 		return worldsDir;