diff --git a/PvPManager/src/main/java/me/NoChance/PvPManager/Player/TeamProfile.java b/PvPManager/src/main/java/me/NoChance/PvPManager/Player/TeamProfile.java
index b7dc88dd1..0622a6bc0 100644
--- a/PvPManager/src/main/java/me/NoChance/PvPManager/Player/TeamProfile.java
+++ b/PvPManager/src/main/java/me/NoChance/PvPManager/Player/TeamProfile.java
@@ -25,7 +25,7 @@ public TeamProfile(final PvPlayer p) {
 		setupTeams();
 		final Team team = scoreboard.getEntryTeam(pvPlayer.getName());
 		// player got stuck in this team somehow (server crash?)
-		if (team != null && team.getPrefix().equals(ChatColor.translateAlternateColorCodes('&', Settings.getNameTagColor()))) {
+		if (team != null && team.getScoreboard() != null && team.getPrefix().equals(ChatColor.translateAlternateColorCodes('&', Settings.getNameTagColor()))) {
 			team.removeEntry(pvPlayer.getName());
 		}
 	}
@@ -78,7 +78,14 @@ public final void setInCombat() {
 		if (team != null && !team.equals(inCombat)) {
 			previousTeam = team;
 		}
-		inCombat.addEntry(pvPlayer.getName());
+		try {
+			inCombat.addEntry(pvPlayer.getName());
+		} catch (final IllegalStateException e) {
+			setupTeams();
+			inCombat.addEntry(pvPlayer.getName());
+			Log.info("Failed to add player to combat team");
+			Log.info("This warning can be ignored but if it happens often it means one of your plugins is removing PvPManager teams and causing a conflict");
+		}
 	}
 
 	public final void restoreTeam() {
diff --git a/PvPManager/src/main/java/me/NoChance/PvPManager/PvPlayer.java b/PvPManager/src/main/java/me/NoChance/PvPManager/PvPlayer.java
index 49978e618..f506ff1a7 100644
--- a/PvPManager/src/main/java/me/NoChance/PvPManager/PvPlayer.java
+++ b/PvPManager/src/main/java/me/NoChance/PvPManager/PvPlayer.java
@@ -48,7 +48,7 @@ public PvPlayer(final Player player, final PvPManager plugin) {
 				Settings.setUseNameTag(false);
 				Settings.setToggleNametagsEnabled(false);
 				this.teamProfile = null;
-				Log.severe("Colored nametags disabled. You need to update your Spigot version.");
+				Log.warning("Colored nametags disabled. You need to update your Spigot version.");
 			}
 		}
 	}