From 206bafce7bd809f491ce7cd30f08e9720b9fb236 Mon Sep 17 00:00:00 2001
From: Brandon Smith <brandon.smith@ironboots.net>
Date: Thu, 13 Aug 2015 13:09:43 -0300
Subject: [PATCH] Bug fixes

---
 Discord.Net/DiscordClient.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Discord.Net/DiscordClient.cs b/Discord.Net/DiscordClient.cs
index 55eb1819d..28cbb3a19 100644
--- a/Discord.Net/DiscordClient.cs
+++ b/Discord.Net/DiscordClient.cs
@@ -351,7 +351,8 @@ namespace Discord
 						{
 							var data = e.Event.ToObject<WebSocketEvents.MessageDelete>();
 							var msg = GetMessage(data.MessageId);
-							_messages.Remove(msg.Id);
+							if (msg != null)
+								_messages.Remove(msg.Id);
 						}
 						break;
 					case "MESSAGE_ACK":
@@ -464,9 +465,9 @@ namespace Discord
 			var response = await DiscordAPI.CreateChannel(serverId, name, region, _httpOptions);
 			return _channels.Update(response.Id, response);
 		}
-		public Task<Channel> CreatePMChannel(User user, string name, string region)
-			=> CreateChannel(user.Id, name, region);
-		public async Task<Channel> CreatePMChannel(string recipientId, string name, string region)
+		public Task<Channel> CreatePMChannel(User user)
+			=> CreatePMChannel(user.Id);
+		public async Task<Channel> CreatePMChannel(string recipientId)
 		{
 			CheckReady();
 			var response = await DiscordAPI.CreatePMChannel(UserId, recipientId, _httpOptions);