From 62822daa1cb51b0d1b20acae359801bb56f21fc3 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Mon, 28 Dec 2015 17:56:14 -0400
Subject: [PATCH] Minor Cleanup

---
 src/Discord.Net/DiscordClient.cs | 5 +++--
 src/Discord.Net/Models/Server.cs | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 6f100241a..dc4ab0608 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -926,8 +926,9 @@ namespace Discord
                                 //Logger.Verbose($"Presence Updated: {server.Name}/{user.Name}");
                                 OnUserPresenceUpdated(user);
                             }
-                            else
-                                Logger.Warning("PRESENCE_UPDATE referenced an unknown user.");
+                            /*else
+                                Logger.Warning("PRESENCE_UPDATE referenced an unknown user.");*/
+                                //This happens when users leave a server
                         }
                         break;
                     case "TYPING_START":
diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs
index 2d19faec4..7f282b45c 100644
--- a/src/Discord.Net/Models/Server.cs
+++ b/src/Discord.Net/Models/Server.cs
@@ -409,16 +409,19 @@ namespace Discord
             {
                 foreach (var channel in AllChannels)
                     channel.RemoveUser(id);
+                return member.User;
             }
-            return member.User;
+            return null;
         }
 
         /// <summary> Gets the user with the provided id and is a member of this server, or null if not found. </summary>
         public User GetUser(ulong id)
         {
             Member result;
-            _users.TryGetValue(id, out result);
-            return result.User;
+            if (_users.TryGetValue(id, out result))
+                return result.User;
+            else
+                return null;
         }
         /// <summary> Gets the user with the provided username and discriminator, that is a member of this server, or null if not found. </summary>
         public User GetUser(string name, ushort discriminator)