diff --git a/src/main/java/dev/pluginz/combatlogger/listeners/DeathListener.java b/src/main/java/dev/pluginz/combatlogger/listeners/DeathListener.java
index 8d85062..b5e6157 100644
--- a/src/main/java/dev/pluginz/combatlogger/listeners/DeathListener.java
+++ b/src/main/java/dev/pluginz/combatlogger/listeners/DeathListener.java
@@ -36,9 +36,10 @@ public DeathListener(CombatLoggerPlugin plugin){
         this.plugin = plugin;
     }
     @EventHandler
-    public void onPlayerQuit(PlayerDeathEvent event) {
+    public void onPlayerDeath(PlayerDeathEvent event) {
         if (Objects.equals(event.getDeathMessage(), event.getEntity().getPlayer().getName() + " died")){
             event.setDeathMessage(event.getEntity().getPlayer().getName() + " died because he left during combat");
         }
+        plugin.getCombatManager().removePlayerFromCombat(event.getEntity().getPlayer());
     }
 }
diff --git a/src/main/java/dev/pluginz/combatlogger/managers/ConfigManager.java b/src/main/java/dev/pluginz/combatlogger/managers/ConfigManager.java
index 6129b14..b6ebfd1 100644
--- a/src/main/java/dev/pluginz/combatlogger/managers/ConfigManager.java
+++ b/src/main/java/dev/pluginz/combatlogger/managers/ConfigManager.java
@@ -60,7 +60,8 @@ public void loadConfig() {
             combatTimeout = config.getInt("combatTimeout", 30);
             checkVersion = config.getBoolean("checkVersion", true);
         } catch (IOException e) {
-            plugin.getLogger().severe("Could not load configuration: " + e.getMessage());
+            //plugin.getLogger().severe("Could not load configuration: " + e.getMessage());
+            plugin.getLogger().severe("Error while loading the configuration");
         }
     }
 
@@ -68,7 +69,7 @@ public void saveConfig() {
         try {
             config.save();
         } catch (IOException e) {
-            plugin.getLogger().severe("Could not save configuration: " + e.getMessage());
+            plugin.getLogger().severe("Error while saving the configuration");
         }
     }
     public void reloadConfig() {