From c16cb317825ebf369518904077a755f7de424145 Mon Sep 17 00:00:00 2001
From: Brandon Smith <brandon.smith@ironboots.net>
Date: Sat, 22 Aug 2015 03:44:05 -0300
Subject: [PATCH] Better handle user exceptions

---
 src/Discord.Net/DiscordWebSocket.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net/DiscordWebSocket.cs b/src/Discord.Net/DiscordWebSocket.cs
index 0325c659a..01c6144ef 100644
--- a/src/Discord.Net/DiscordWebSocket.cs
+++ b/src/Discord.Net/DiscordWebSocket.cs
@@ -150,7 +150,11 @@ namespace Discord
 								QueueMessage(new WebSocketCommands.KeepAlive());
 								_connectWaitOnLogin.Set(); //Pre-Event
                             }
-							RaiseGotEvent(msg.Type, msg.Payload as JToken);
+							try
+							{
+								RaiseGotEvent(msg.Type, msg.Payload as JToken);
+							}
+							catch { } //Don't allow user exceptions to affect our state
 							if (msg.Type == "READY")
 								_connectWaitOnLogin2.Set(); //Post-Event
 							break;