From cf413bd472aa16a45000c27938037f966c79bfbf Mon Sep 17 00:00:00 2001
From: abalabahaha <hi@abal.moe>
Date: Wed, 1 Jun 2016 13:11:04 -0700
Subject: [PATCH] Check for valid author

---
 lib/Structures/Message.js | 2 +-
 src/Structures/Message.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js
index 9d9cf925a..16db2b847 100644
--- a/lib/Structures/Message.js
+++ b/lib/Structures/Message.js
@@ -56,7 +56,7 @@ var Message = (function (_Equality) {
 
 		if (data.author instanceof _User2["default"]) {
 			this.author = data.author;
-		} else {
+		} else if (data.author) {
 			this.author = client.internal.users.add(new _User2["default"](data.author, client));
 		}
 
diff --git a/src/Structures/Message.js b/src/Structures/Message.js
index c777714e0..1d82d70df 100644
--- a/src/Structures/Message.js
+++ b/src/Structures/Message.js
@@ -31,7 +31,7 @@ export default class Message extends Equality{
 
 		if(data.author instanceof User) {
 			this.author = data.author;
-		} else {
+		} else if(data.author) {
 			this.author = client.internal.users.add(new User(data.author, client));
 		}