From 1ed853da42b9bacc25c01737702d896f8e129751 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sat, 24 Oct 2015 22:37:14 -0300
Subject: [PATCH] Give private users a proper ID.

---
 src/Discord.Net/DiscordClient.Members.cs | 2 +-
 src/Discord.Net/DiscordClient.cs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.Members.cs b/src/Discord.Net/DiscordClient.Members.cs
index 76350100b..41cece723 100644
--- a/src/Discord.Net/DiscordClient.Members.cs
+++ b/src/Discord.Net/DiscordClient.Members.cs
@@ -10,7 +10,7 @@ namespace Discord
 		public Members(DiscordClient client, object writerLock)
 			: base(client, writerLock, x => x.OnCached(), x => x.OnUncached()) { }
 		private string GetKey(string userId, string serverId)
-			=> serverId + '_' + userId;
+			=> (serverId ?? "Private") + '_' + userId;
 
 		public User this[string userId, string serverId]
 			=> this[GetKey(userId, serverId)];
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index aefe3d85b..7577b9398 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -549,7 +549,7 @@ namespace Discord
 							var channel = _channels[data.ChannelId];
 							if (channel != null)
 							{
-								var user = _members[data.UserId, channel.Server.Id];
+								var user = _members[data.UserId, channel.Server?.Id];
 
 								if (user != null)
 								{