diff --git a/src/main/java/me/chayapak1/chomens_bot/Main.java b/src/main/java/me/chayapak1/chomens_bot/Main.java
index b2e2f815..d0aa9b74 100644
--- a/src/main/java/me/chayapak1/chomens_bot/Main.java
+++ b/src/main/java/me/chayapak1/chomens_bot/Main.java
@@ -192,9 +192,7 @@ public class Main {
         LoggerUtilities.log(stoppingMessage);
 
         EXECUTOR.shutdown();
-
         EXECUTOR_SERVICE.shutdown();
-
         if (database != null) database.stop();
 
         final ArrayList<Bot> copiedList;
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
index 84c0f1ae..de55145d 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersDatabasePlugin.java
@@ -186,6 +186,8 @@ public class PlayersDatabasePlugin implements Listener {
 
     @Override
     public void disconnected (final DisconnectedEvent event) {
+        if (Main.stopping) return;
+
         synchronized (bot.players.list) {
             final List<PlayerEntry> clonedList = new ArrayList<>(bot.players.list);
 
diff --git a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
index 470221ee..056b7b2a 100644
--- a/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
+++ b/src/main/java/me/chayapak1/chomens_bot/util/FileLoggerUtilities.java
@@ -74,6 +74,10 @@ public class FileLoggerUtilities {
         }
     }
 
+    public static void stop () {
+        executor.shutdown();
+    }
+
     private static void tick () {
         if (freezeTime <= System.currentTimeMillis() && spamLevel > 0) {
             spamLevel--;