diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index ecc2863ee..fd9af1619 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -375,6 +375,7 @@ var InternalClient = (function () {
 							if (data.d.guild_id !== server.id) return; // ensure it is the right server
 							token = data.d.token;
 							endpoint = data.d.endpoint;
+							if (!token || !endpoint) return;
 							var chan = new _VoiceVoiceConnection2["default"](channel, _this5.client, session, token, server, endpoint);
 							_this5.voiceConnections.add(chan);
 
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index 7ed897ba8..07d7edc0c 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -292,9 +292,10 @@ export default class InternalClient {
 
 					var check = data => {
 						if (data.t === "VOICE_SERVER_UPDATE") {
-							if (data.d.guild_id !== server.id) return // ensure it is the right server
+							if (data.d.guild_id !== server.id) return; // ensure it is the right server
 							token = data.d.token;
 							endpoint = data.d.endpoint;
+							if (!token || !endpoint) return;
 							var chan = new VoiceConnection(
 								channel, this.client, session, token, server, endpoint
 							);