diff --git a/src/Discord.Net/API/Client/Common/ExtendedGuild.cs b/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
index 80e9bec64..4e11d2ba2 100644
--- a/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
+++ b/src/Discord.Net/API/Client/Common/ExtendedGuild.cs
@@ -20,7 +20,17 @@ namespace Discord.API.Client
         public MemberPresence[] Presences { get; set; }
         [JsonProperty("voice_states")]
         public MemberVoiceState[] VoiceStates { get; set; }
+        [JsonProperty("large")]
+        public bool IsLarge { get; set; }
         [JsonProperty("unavailable")]
         public bool? Unavailable { get; set; }
+
+        //Unknown
+        [JsonProperty("splash")]
+        public object Splash { get; set; }
+        [JsonProperty("features")]
+        public object Features { get; set; }
+        [JsonProperty("emojis")]
+        public object Emojis { get; set; }
     }
 }
diff --git a/src/Discord.Net/API/Client/GatewaySocket/Events/Ready.cs b/src/Discord.Net/API/Client/GatewaySocket/Events/Ready.cs
index e1ce84ace..b17ffd61d 100644
--- a/src/Discord.Net/API/Client/GatewaySocket/Events/Ready.cs
+++ b/src/Discord.Net/API/Client/GatewaySocket/Events/Ready.cs
@@ -28,5 +28,11 @@ namespace Discord.API.Client.GatewaySocket
         public Channel[] PrivateChannels { get; set; }
         [JsonProperty("heartbeat_interval")]
         public int HeartbeatInterval { get; set; }
+
+        //Ignored
+        [JsonProperty("user_settings")]
+        public object UserSettings { get; set; }
+        [JsonProperty("user_guild_settings")]
+        public object UserGuildSettings { get; set; }
     }
 }
diff --git a/src/Discord.Net/TaskManager.cs b/src/Discord.Net/TaskManager.cs
index 7aad93533..376a6aa1e 100644
--- a/src/Discord.Net/TaskManager.cs
+++ b/src/Discord.Net/TaskManager.cs
@@ -19,7 +19,7 @@ namespace Discord
         public bool WasUnexpected => _wasStopUnexpected;
         private bool _wasStopUnexpected;
 
-        public Exception Exception => _stopReason.SourceException;
+        public Exception Exception => _stopReason?.SourceException;
         private ExceptionDispatchInfo _stopReason;
 
         public TaskManager()