diff --git a/src/de/steamwar/bungeecore/listeners/BanListener.java b/src/de/steamwar/bungeecore/listeners/BanListener.java
index a4fbbec..c62a17d 100644
--- a/src/de/steamwar/bungeecore/listeners/BanListener.java
+++ b/src/de/steamwar/bungeecore/listeners/BanListener.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.bungeecore.listeners;
 
-import de.steamwar.bungeecore.BungeeCore;
 import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.sql.BannedUserIPs;
 import de.steamwar.bungeecore.sql.SteamwarUser;
diff --git a/src/de/steamwar/bungeecore/sql/Punishment.java b/src/de/steamwar/bungeecore/sql/Punishment.java
index 964961d..0e47e05 100644
--- a/src/de/steamwar/bungeecore/sql/Punishment.java
+++ b/src/de/steamwar/bungeecore/sql/Punishment.java
@@ -43,10 +43,12 @@ public class Punishment {
     }
 
     public static Map<PunishmentType, Punishment> getPunishmentsOfPlayer(int user) {
-        Map<PunishmentType, Punishment> punishmentMap = new HashMap<>();
-        punishmentMap.put(PunishmentType.Ban, getPunishmentOfPlayer(user, PunishmentType.Ban));
-        punishmentMap.put(PunishmentType.Mute, getPunishmentOfPlayer(user, PunishmentType.Mute));
-        return punishmentMap;
+        Map<PunishmentType, Punishment> punishments = new HashMap<>();
+        Punishment banPunishment = getPunishmentOfPlayer(user, PunishmentType.Ban);
+        if(banPunishment != null) punishments.put(PunishmentType.Ban, banPunishment);
+        Punishment mutePunishment = getPunishmentOfPlayer(user, PunishmentType.Mute);
+        if(mutePunishment != null) punishments.put(PunishmentType.Mute, mutePunishment);
+        return punishments;
     }
 
     public static List<Punishment> getAllPunishmentsOfPlayer(int user) {