diff --git a/src/Discord.Net/Models/Channel.cs b/src/Discord.Net/Models/Channel.cs index acbf2128e..63b51c4d2 100644 --- a/src/Discord.Net/Models/Channel.cs +++ b/src/Discord.Net/Models/Channel.cs @@ -564,13 +564,25 @@ namespace Discord { if (!Client.Config.UsePermissionsCache) { - var user = Server.GetUser(id); - ChannelPermissions perms = new ChannelPermissions(); - UpdatePermissions(user, perms); - if (perms.ReadMessages) - return user; + if (Server != null) + { + var user = Server.GetUser(id); + if (user != null) + { + ChannelPermissions perms = new ChannelPermissions(); + UpdatePermissions(user, perms); + if (perms.ReadMessages) + return user; + } + } else - return null; + { + if (id == Recipient.Id) + return Recipient; + else if (id == Client.PrivateUser.Id) + return Client.PrivateUser; + } + return null; } Member result;