From af9a2c2d64560bd214f6f3689b9cc9d6c6c5288a Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Thu, 13 Oct 2016 13:49:16 -0300
Subject: [PATCH] Fixed nullref on guild member remove

---
 src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index d87b82c6f..11ac15248 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -380,9 +380,9 @@ namespace Discord.WebSocket
             if (_members.TryRemove(id, out member))
             {
                 DownloadedMemberCount--;
+                member.GlobalUser.RemoveRef(Discord);
                 return member;
             }
-            member.GlobalUser.RemoveRef(Discord);
             return null;
         }