diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7f98691..ac58b0c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -384,9 +384,10 @@
 
 	public void run()
 	{
+		boolean normalStarted = false;
 		try
 		{
-			if (this.startServer())
+			if (normalStarted = startServer())
 			{
 				FMLCommonHandler.instance().handleServerStarted();
 				long i = getSystemTimeMillis();
@@ -477,7 +478,7 @@
 			{
 				try
 				{
-					FMLCommonHandler.instance().handleServerStopped();
+					if(normalStarted) FMLCommonHandler.instance().handleServerStopped();
 				}
 				finally
 				{