From 36f40c18d514e0bcd2fdaef6e20b8f4c817dec68 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Mon, 7 Sep 2015 23:11:28 -0300
Subject: [PATCH] Added a null-user check to FindMembers

---
 src/Discord.Net/DiscordClient.Cache.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Discord.Net/DiscordClient.Cache.cs b/src/Discord.Net/DiscordClient.Cache.cs
index 59b73ae02..a1ff316d4 100644
--- a/src/Discord.Net/DiscordClient.Cache.cs
+++ b/src/Discord.Net/DiscordClient.Cache.cs
@@ -359,13 +359,20 @@ namespace Discord
 				return server.Members.Where(x =>
 				{
 					var user = x.User;
+					if (user == null)
+						return false;
 					return string.Equals(user.Name, name, StringComparison.OrdinalIgnoreCase) || string.Equals(user.Name, name2, StringComparison.OrdinalIgnoreCase);
 				});
 			}
 			else
 			{
 				return server.Members.Where(x =>
+				{
+					var user = x.User;
+					if (user == null)
+						return false;
 					string.Equals(x.User.Name, name, StringComparison.OrdinalIgnoreCase));
+				}
 			}
 		}