From 7473ed331dce2bb930e861942e85d3c013fc4a8f Mon Sep 17 00:00:00 2001
From: Christopher F <foxbot@protonmail.com>
Date: Sat, 9 Jul 2016 00:04:48 -0400
Subject: [PATCH] Add null-conditional to MessageManager

---
 src/Discord.Net/Entities/WebSocket/MessageManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Discord.Net/Entities/WebSocket/MessageManager.cs b/src/Discord.Net/Entities/WebSocket/MessageManager.cs
index 98fde21b0..ea9ec11c8 100644
--- a/src/Discord.Net/Entities/WebSocket/MessageManager.cs
+++ b/src/Discord.Net/Entities/WebSocket/MessageManager.cs
@@ -61,7 +61,7 @@ namespace Discord
                 };
                 var downloadedMessages = await _discord.ApiClient.GetChannelMessagesAsync(_channel.Id, args).ConfigureAwait(false);
 
-                var guild = (_channel as ICachedGuildChannel).Guild;
+                var guild = (_channel as ICachedGuildChannel)?.Guild;
                 return cachedMessages.Concat(downloadedMessages.Select(x =>
                 {
                     IUser user = _channel.GetUser(x.Author.Value.Id, true);