diff --git a/src/client/voice/VoiceConnection.js b/src/client/voice/VoiceConnection.js
index dbc5abf55..36727e7e8 100644
--- a/src/client/voice/VoiceConnection.js
+++ b/src/client/voice/VoiceConnection.js
@@ -169,19 +169,20 @@ class VoiceConnection extends EventEmitter {
    * @returns {void}
    */
   setTokenAndEndpoint(token, endpoint) {
-    if (!token) {
-      this.authenticateFailed('Token not provided from voice server packet.');
+    if (!endpoint) {
+      // Signifies awaiting endpoint stage
       return;
     }
-    if (!endpoint) {
-      this.authenticateFailed('Endpoint not provided from voice server packet.');
+
+    if (!token) {
+      this.authenticateFailed('Token not provided from voice server packet.');
       return;
     }
 
     endpoint = endpoint.match(/([^:]*)/)[0];
 
     if (!endpoint) {
-      this.authenticateFailed('Failed to find an endpoint.');
+      this.authenticateFailed('Invalid endpoint received.');
       return;
     }