From 0e2ccdd1f6865666427e2553051814a45543cd80 Mon Sep 17 00:00:00 2001
From: justcool393 <wayhay53@gmail.com>
Date: Sun, 13 Oct 2013 16:21:18 -0700
Subject: [PATCH] Fix Unhandled WebException

This commit fixes an unhandled WebException that may occur when
attempting to connect to the Minecraft session server when it is very
slow or unreachable.
---
 MinecraftClient/MinecraftCom.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/MinecraftClient/MinecraftCom.cs b/MinecraftClient/MinecraftCom.cs
index 71c7d465..17fbdb6a 100644
--- a/MinecraftClient/MinecraftCom.cs
+++ b/MinecraftClient/MinecraftCom.cs
@@ -79,7 +79,19 @@ namespace MinecraftClient
             Console.ForegroundColor = ConsoleColor.DarkGray;
             WebClient client = new WebClient();
             Console.Write("http://session.minecraft.net/game/joinserver.jsp?user=" + user + "&sessionId=" + sessionID + "&serverId=" + hash + " ... ");
-            string result = client.DownloadString("http://session.minecraft.net/game/joinserver.jsp?user=" + user + "&sessionId=" + sessionID + "&serverId=" + hash);
+            string result;
+            try
+            {
+                result = client.DownloadString("http://session.minecraft.net/game/joinserver.jsp?user=" + user + "&sessionId=" + sessionID + "&serverId=" + hash);
+            }
+            catch (WebException e)
+            {
+                Console.ForegroundColor = ConsoleColor.Gray;
+                Console.WriteLine();
+                Console.WriteLine("Error while connecting to session server: " + e.Message);
+                Console.ForegroundColor = ConsoleColor.DarkGray;
+                return false;
+            }
             Console.WriteLine(result);
             Console.ForegroundColor = ConsoleColor.Gray;
             return (result == "OK");