diff --git a/lib/structures/Message.js b/lib/structures/Message.js
index bda0903b7..0074c0891 100644
--- a/lib/structures/Message.js
+++ b/lib/structures/Message.js
@@ -100,7 +100,7 @@ class Message extends Base {
         } else if(this.type === 7) {
             data.content = SystemJoinMessages[~~(this.createdAt % SystemJoinMessages.length)].replace(/%user%/g, this.author.mention);
         } else {
-            throw new Error("Unhandled MESSAGE_CREATE type: " + JSON.stringify(data, null, 2));
+            client.emit("warn", "Unhandled MESSAGE_CREATE type: " + JSON.stringify(data, null, 2));
         }
 
         this.update(data, client);