diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java
index 13fa1b5f5..2f09c66bf 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java
@@ -22,8 +22,6 @@ public class StopCommand extends CommandBase<ArcadeManager>
 		if (Plugin.GetGame() == null)
 			return; 
 
-		HandlerList.unregisterAll(Plugin.GetGame());
-		
 		if (Plugin.GetGame().GetState() == GameState.End || Plugin.GetGame().GetState() == GameState.End)
 		{
 			caller.sendMessage("Game is already ending..."); 
@@ -38,6 +36,7 @@ public class StopCommand extends CommandBase<ArcadeManager>
 			Plugin.GetGame().SetState(GameState.End);
 		}
 
+		HandlerList.unregisterAll(Plugin.GetGame());
 
 		Plugin.GetGame().Announce(C.cAqua + C.Bold + caller.getName() + " has stopped the game.");
 	}