From 4ec052a35cd4ee812504ff9d1fd7240d546995ec Mon Sep 17 00:00:00 2001 From: Rapptz Date: Wed, 14 Oct 2015 21:03:29 -0400 Subject: [PATCH] Check if the server is valid during GUILD_MEMBER_REMOVE. --- discord/client.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/discord/client.py b/discord/client.py index 6e8872ffd..3640b2e71 100644 --- a/discord/client.py +++ b/discord/client.py @@ -276,10 +276,11 @@ class ConnectionState(object): def handle_guild_member_remove(self, data): server = self._get_server(data.get('guild_id')) - user_id = data['user']['id'] - member = utils.find(lambda m: m.id == user_id, server.members) - server.members.remove(member) - self.dispatch('member_remove', member) + if server is not None: + user_id = data['user']['id'] + member = utils.find(lambda m: m.id == user_id, server.members) + server.members.remove(member) + self.dispatch('member_remove', member) def handle_guild_member_update(self, data): server = self._get_server(data.get('guild_id'))