Catch errors thrown during login validation (#2406)

discord-jda · Feb 21, 2023 · 799b1ac · 799b1ac
1 parent 8e46689
commit 799b1ac
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/JDAImpl.java b/src/main/java/net/dv8tion/jda/internal/JDAImpl.java
@@ -394,14 +394,22 @@ else if (response.code == 401)
             }
         }.priority();
 
-        DataObject userResponse = login.complete();
-        if (userResponse != null)
+        try
         {
-            getEntityBuilder().createSelfUser(userResponse);
-            return;
+            DataObject userResponse = login.complete();
+            if (userResponse != null)
+            {
+                getEntityBuilder().createSelfUser(userResponse);
+                return;
+            }
+
+            throw new InvalidTokenException("The provided token is invalid!");
+        }
+        catch (Throwable error)
+        {
+            shutdownNow();
+            throw error;
         }
-        shutdownNow();
-        throw new InvalidTokenException("The provided token is invalid!");
     }
 
     public AuthorizationConfig getAuthorizationConfig()