diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index deb932f..f70297e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -420,7 +420,7 @@
 			}
 			else
 			{
-				this.finalTick((CrashReport)null);
+				//this.finalTick((CrashReport)null);
 			}
 		}
 		catch (StartupQuery.AbortedException e)
@@ -452,7 +452,7 @@
 				logger.error("We were unable to save this crash report to disk.");
 			}
 
-			this.finalTick(crashreport);
+			//this.finalTick(crashreport);
 		}
 		finally
 		{
@@ -467,9 +467,15 @@
 			}
 			finally
 			{
-				FMLCommonHandler.instance().handleServerStopped();
-				this.serverStopped = true;
-				this.systemExitNow();
+				try
+				{
+					FMLCommonHandler.instance().handleServerStopped();
+				}
+				finally
+				{
+					this.serverStopped = true;
+					this.systemExitNow();
+				}
 			}
 		}
 	}