diff --git a/lib/structures/Message.js b/lib/structures/Message.js
index 605e59dd..8a3b93fa 100644
--- a/lib/structures/Message.js
+++ b/lib/structures/Message.js
@@ -176,7 +176,7 @@ class Message extends Base {
                  * @type {Member?}
                  */
                 this.member = this.channel.guild.members.update(data.member, this.channel.guild);
-            } else if(this.channel.guild.members.has(this.author.id)) {
+            } else if(this.author && this.channel.guild.members.has(this.author.id)) {
                 this.member = this.channel.guild.members.get(this.author.id);
             } else {
                 this.member = null;