From 0b2778c114b36c747a79a0c0dee3767e71f5166e Mon Sep 17 00:00:00 2001
From: hydrabolt <amishshah.2k@gmail.com>
Date: Fri, 30 Oct 2015 13:52:53 +0000
Subject: [PATCH] Updated message class

Will now crash less when handling masses of data from hundreds of
server, as sometimes when a server is destroyed the message still
believes it exists
---
 src/message.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/message.js b/src/message.js
index 796c8dc5f..b3b7e6680 100644
--- a/src/message.js
+++ b/src/message.js
@@ -23,7 +23,7 @@ class Message {
 		if (this.isPrivate) {
 			this.author = this.channel.client.getUser("id", author.id);
 		} else {
-			this.author = this.channel.server.getMember("id", author.id) || this.channel.client.getUser("id", author.id);
+			this.author = this.channel.server ? this.channel.server.getMember("id", author.id) : this.channel.client.getUser("id", author.id);
 		}
 
 		this.attachments = data.attachments;