diff --git a/src/Discord.Net/API/Client/Common/Game.cs b/src/Discord.Net/API/Client/Common/Game.cs
index e41306cdc..87c583bc5 100644
--- a/src/Discord.Net/API/Client/Common/Game.cs
+++ b/src/Discord.Net/API/Client/Common/Game.cs
@@ -9,6 +9,6 @@ namespace Discord.API.Client
         [JsonProperty("url")]
         public string Url { get; set; }
         [JsonProperty("type")]
-        public GameType Type { get; set; }
+        public GameType? Type { get; set; }
     }
 }
diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 3a2af6a12..2959c5b7f 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -211,7 +211,7 @@ namespace Discord
 			}
 
             if (model.Game != null)
-                CurrentGame = new Game(model.Game.Name, model.Game.Type, model.Game.Url);
+                CurrentGame = new Game(model.Game.Name, model.Game.Type ?? GameType.Default, model.Game.Url);
             else
                 CurrentGame = null;
 		}
diff --git a/src/Discord.Net/Net/WebSockets/BuiltInEngine.cs b/src/Discord.Net/Net/WebSockets/BuiltInEngine.cs
index 460e608eb..a6c9d1676 100644
--- a/src/Discord.Net/Net/WebSockets/BuiltInEngine.cs
+++ b/src/Discord.Net/Net/WebSockets/BuiltInEngine.cs
@@ -51,8 +51,7 @@ namespace Discord.Net.WebSockets
         {
             string ignored;
             while (_sendQueue.TryDequeue(out ignored)) { }
-
-            var socket = _webSocket;
+            
             _webSocket = null;
 
             return TaskHelper.CompletedTask;