From 7f1c17e962076896afefd5fc59f8695f08f093c2 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 15 Sep 2015 15:54:02 -0300
Subject: [PATCH] Fixed message edit crash

---
 src/Discord.Net/DiscordClient.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 78505b451..355c3ab1f 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -368,9 +368,12 @@ namespace Discord
 					case "MESSAGE_UPDATE":
 						{
 							var data = e.Payload.ToObject<Events.MessageUpdate>(_serializer);
-							var msg = _messages.GetOrAdd(data.Id, data.ChannelId, data.Author.Id);
-							msg.Update(data);
-							RaiseEvent(nameof(MessageUpdated), () => RaiseMessageUpdated(msg));
+							var msg = _messages[data.Id];
+                            if (msg != null)
+							{
+								msg.Update(data);
+								RaiseEvent(nameof(MessageUpdated), () => RaiseMessageUpdated(msg));
+							}
 						}
 						break;
 					case "MESSAGE_DELETE":