diff --git a/Discord.Net/API/Models/WebSocketEvents.cs b/Discord.Net/API/Models/WebSocketEvents.cs
index 50acf39bf..58860df14 100644
--- a/Discord.Net/API/Models/WebSocketEvents.cs
+++ b/Discord.Net/API/Models/WebSocketEvents.cs
@@ -27,7 +27,7 @@ namespace Discord.API.Models
 
 		//Servers
 		public sealed class GuildCreate : ExtendedServerInfo { }
-		public sealed class GuildUpdate : ExtendedServerInfo { }
+		public sealed class GuildUpdate : ServerInfo { }
 		public sealed class GuildDelete : ExtendedServerInfo { }
 
 		//Channels
diff --git a/Discord.Net/DiscordWebSocket.cs b/Discord.Net/DiscordWebSocket.cs
index 216cb7459..87bfd1f5d 100644
--- a/Discord.Net/DiscordWebSocket.cs
+++ b/Discord.Net/DiscordWebSocket.cs
@@ -71,7 +71,7 @@ namespace Discord
         }
 		public async Task DisconnectAsync()
 		{
-			if (_webSocket != null)
+			if (_tasks != null)
 			{
 				_cancelToken.Cancel();
 				await _tasks;