From c280ed0bda9dd15389b58e8a8a07298db98ddbb6 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 3 Nov 2015 17:13:01 -0400
Subject: [PATCH] Fixed nullref in Message.Update

---
 src/Discord.Net/Models/Message.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Discord.Net/Models/Message.cs b/src/Discord.Net/Models/Message.cs
index c39ad08d1..57efc1e64 100644
--- a/src/Discord.Net/Models/Message.cs
+++ b/src/Discord.Net/Models/Message.cs
@@ -228,15 +228,24 @@ namespace Discord
 					text = Mention.CleanChannelMentions(_client, server, text, mentionedChannels);
 					text = Mention.CleanRoleMentions(_client, server, text, mentionedRoles);
 				}
+				Text = text;
 
 				//MentionedUsers = mentionedUsers;
 				MentionedChannels = mentionedChannels;
 				MentionedRoles = mentionedRoles;
 			}
-			
-			IsMentioningMe = model.Mentions
-				.Any(x => x.Id == _client.CurrentUserId) ||
-				(server != null && MentionedRoles.Any(x => server.CurrentUser.HasRole(x)));
+
+			if (server != null)
+			{
+				var me = server.CurrentUser;
+				IsMentioningMe = (MentionedUsers?.Contains(me) ?? false) || 
+					(MentionedRoles?.Any(x => me.HasRole(x)) ?? false);
+			}
+			else
+			{
+				var me = _client.CurrentUser;
+				IsMentioningMe = MentionedUsers?.Contains(me) ?? false;
+            }
         }
 
 		public override bool Equals(object obj) => obj is Message && (obj as Message).Id == Id;