diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
index ed2ba314..40d9897a 100644
--- a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
+++ b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
@@ -8,6 +8,7 @@ import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
 import java.util.*;
+import java.util.logging.Level;
 
 public class FTeamWrapper {
     private static final Map<Faction, FTeamWrapper> wrappers = new HashMap<Faction, FTeamWrapper>();
@@ -75,6 +76,10 @@ public class FTeamWrapper {
         if (!FScoreboard.isSupportedByServer()) {
             return;
         }
+        if(!wrappers.containsKey(faction)) {
+            P.p.log(Level.WARNING, "Something went wrong when updating the prefix for %s", faction.getTag());
+            return;
+        }
         wrappers.get(faction).updatePrefixes();
     }