1 files changed, 23 insertions, 11 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
index 9a9c64134..17f6502fb 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
@@ -33,22 +33,33 @@ public class StateMachine extends WorkListener
 
 	public MachineResult askQuestion()
 	{
-		while (current.guessAnswer())
+		try
 		{
-			current = current.getNextState();
-			if (current == null)
+			while (current.guessAnswer())
 			{
-				result = MachineResult.DONE;
-				break;
+
+				current = current.getNextState();
+				if (current == null)
+				{
+					result = MachineResult.DONE;
+					break;
+				}
+
 			}
-		}
-		if (current != null)
-		{
-			if (player.isOnline())
+			if (current != null)
 			{
-				current.askQuestion(player);
+				if (player.isOnline())
+				{
+					current.askQuestion(player);
+				}
+				result = MachineResult.WAIT;
 			}
-			result = MachineResult.WAIT;
+		}
+		catch (RuntimeException ex)
+		{
+			player.sendMessage(ex.getMessage());
+			finish();
+			result = MachineResult.ABORT;
 		}
 		return result;
 	}
@@ -135,6 +146,7 @@ public class StateMachine extends WorkListener
 
 	private void finish()
 	{
+		current = null;
 		iterator = null;
 		states.clear();
 		getPlugin().getServer().getPluginManager().callEvent(new InstallationFinishedEvent());