From 8d953a69e998a5ebf89c21a5a4f7d9bb553f09ca Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sat, 31 Oct 2015 00:36:24 -0300
Subject: [PATCH] Dont crash if a mention is sent in PM

---
 src/Discord.Net/Helpers/Mention.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net/Helpers/Mention.cs b/src/Discord.Net/Helpers/Mention.cs
index 02cdb13f7..a48aecc07 100644
--- a/src/Discord.Net/Helpers/Mention.cs
+++ b/src/Discord.Net/Helpers/Mention.cs
@@ -24,7 +24,7 @@ namespace Discord
 			text = _userRegex.Replace(text, new MatchEvaluator(e =>
 			{
 				string id = e.Value.Substring(2, e.Value.Length - 3);
-				var user = client.Users[id, server.Id];
+				var user = client.Users[id, server?.Id];
 				if (user != null)
 					return '@' + user.Name;
 				else //User not found
@@ -34,7 +34,7 @@ namespace Discord
 			{
 				string id = e.Value.Substring(2, e.Value.Length - 3);
 				var channel = client.Channels[id];
-				if (channel != null && channel.Server.Id == server.Id)
+				if (channel != null && channel.Server?.Id == server?.Id)
 					return '#' + channel.Name;
 				else //Channel not found
 					return '#' + e.Value;