From 7604804d25b401db66a1308b6dc346d552cd8834 Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 28 Oct 2015 22:54:10 -0300 Subject: [PATCH] WebSocketSharp OnError doesn't always give us an exception --- src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs b/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs index b892465f0..35e1ec888 100644 --- a/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs +++ b/src/Discord.Net/Net/WebSockets/WebSocketSharpEngine.cs @@ -51,7 +51,7 @@ namespace Discord.Net.WebSockets }; _webSocket.OnError += async (s, e) => { - _parent.RaiseOnLog(LogMessageSeverity.Error, e.Exception.GetBaseException().Message); + _parent.RaiseOnLog(LogMessageSeverity.Error, e.Exception?.GetBaseException()?.Message ?? e.Message); await _parent.DisconnectInternal(e.Exception, skipAwait: true).ConfigureAwait(false); }; _webSocket.OnClose += async (s, e) =>