From 166161d6d3977d436b967d98ad27cadd723db2ff Mon Sep 17 00:00:00 2001
From: Drahcirius <hardy263@gmail.com>
Date: Mon, 1 May 2017 03:43:35 -0400
Subject: [PATCH] ready event will now throw errors properly (#1440)

---
 src/client/websocket/WebSocketConnection.js            | 7 +++----
 src/client/websocket/packets/WebSocketPacketManager.js | 6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/client/websocket/WebSocketConnection.js b/src/client/websocket/WebSocketConnection.js
index 14de7859a..2cdde55b3 100644
--- a/src/client/websocket/WebSocketConnection.js
+++ b/src/client/websocket/WebSocketConnection.js
@@ -273,12 +273,11 @@ class WebSocketConnection extends EventEmitter {
    */
   onMessage(event) {
     try {
-      this.onPacket(this.unpack(event.data));
-      return true;
+      event.data = this.unpack(event.data);
     } catch (err) {
-      this.debug(err);
-      return false;
+      this.emit('debug', err);
     }
+    return this.onPacket(event.data);
   }
 
   /**
diff --git a/src/client/websocket/packets/WebSocketPacketManager.js b/src/client/websocket/packets/WebSocketPacketManager.js
index a76cf2a99..079ef5d8c 100644
--- a/src/client/websocket/packets/WebSocketPacketManager.js
+++ b/src/client/websocket/packets/WebSocketPacketManager.js
@@ -99,11 +99,7 @@ class WebSocketPacketManager {
     }
 
     if (!queue && this.queue.length > 0) this.handleQueue();
-    try {
-      if (this.handlers[packet.t]) return this.handlers[packet.t].handle(packet);
-    } catch (error) {
-      this.client.emit(Constants.Events.ERROR, error);
-    }
+    if (this.handlers[packet.t]) return this.handlers[packet.t].handle(packet);
     return false;
   }
 }