diff --git a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
index fee8316045..0e19aa3a2e 100644
--- a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
@@ -293,10 +293,7 @@ public int login(String gatewayUrl, ShardInfo shardInfo, Compression compression
         this.gatewayUrl = gatewayUrl == null ? getGateway() : gatewayUrl;
         Checks.notNull(this.gatewayUrl, "Gateway URL");
 
-        String token = authConfig.getToken();
         setStatus(Status.LOGGING_IN);
-        if (token == null || token.isEmpty())
-            throw new InvalidTokenException("Provided token was null or empty!");
 
         Map<String, String> previousContext = null;
         ConcurrentMap<String, String> contextMap = metaConfig.getMdcContextMap();
diff --git a/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java b/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java
index 399b36792a..e980488e7f 100644
--- a/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java
+++ b/src/main/java/net/dv8tion/jda/internal/utils/config/AuthorizationConfig.java
@@ -27,7 +27,8 @@ public final class AuthorizationConfig
 
     public AuthorizationConfig(@Nonnull String token)
     {
-        Checks.notNull(token, "Token");
+        Checks.notEmpty(token, "Token");
+        Checks.noWhitespace(token, "Token");
         setToken(token);
     }