diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
index a42d184a..989fca7a 100644
--- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -23,7 +23,6 @@ import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.NPC;
 import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.SteamwarUser;
-import de.steamwar.sql.UserPerm;
 import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -135,6 +134,10 @@ public class TeamPlayer extends BasicListener {
         return false;
     }
 
+    private String parseRandomMessage(Player player, SteamwarUser target, String message) throws MissingResourceException {
+        return LobbySystem.getMessage().parsePrefixed(message + random.nextInt(6), player, target.getUserName(), target.prefix().getColorCode() + target.prefix().getChatPrefix());
+    }
+
     @EventHandler
     public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
         if (!(event.getRightClicked() instanceof Villager)) {
@@ -144,14 +147,13 @@ public class TeamPlayer extends BasicListener {
             players.remove(event.getPlayer());
             return;
         }
-        SteamwarUser user = SteamwarUser.get(event.getRightClicked().getName());
-        UserPerm.Prefix prefix = user.prefix();
-        Object[] parameters = new Object[]{event.getRightClicked().getName(),prefix.getColorCode() + prefix.getChatPrefix()};
+
+        SteamwarUser target = SteamwarUser.get(event.getRightClicked().getName());
         String message;
         try {
-            message = LobbySystem.getMessage().parsePrefixed("NPC_CHAT_" + user.getId() + "_" + random.nextInt(6), event.getPlayer(),parameters);
-        } catch (Exception e) {
-            message = LobbySystem.getMessage().parsePrefixed("NPC_CHAT_" + random.nextInt(6), event.getPlayer(),parameters);
+            message = parseRandomMessage(event.getPlayer(), target, "NPC_CHAT_" + target.getId() + "_");
+        } catch (MissingResourceException e) {
+            message = parseRandomMessage(event.getPlayer(), target, "NPC_CHAT_");
         }
         event.getPlayer().sendMessage(message);
     }