diff --git a/src/main/java/me/azenet/UHPlugin/UHTeam.java b/src/main/java/me/azenet/UHPlugin/UHTeam.java
index ec09d1c..267182c 100644
--- a/src/main/java/me/azenet/UHPlugin/UHTeam.java
+++ b/src/main/java/me/azenet/UHPlugin/UHTeam.java
@@ -271,6 +271,8 @@ public void removePlayer(OfflinePlayer player, boolean silent) {
 	 * @param player
 	 */
 	private void unregisterPlayer(OfflinePlayer player) {
+		if(player == null) return;
+		
 		plugin.getScoreboardManager().getScoreboard().getTeam(this.internalName).removePlayer(player);
 		plugin.getTeamManager().colorizePlayer(player);
 	}
@@ -283,9 +285,12 @@ private void unregisterPlayer(OfflinePlayer player) {
 	public void deleteTeam() {
 		// We removes the players from the team (scoreboard team too)
 		for(UUID id : players) {
-			Player player = plugin.getServer().getPlayer(id);
+			OfflinePlayer player = plugin.getServer().getOfflinePlayer(id);
+			
+			if(player != null && player.isOnline()) {
+				((Player) player).sendMessage(plugin.getI18n().t("team.removeplayer.removed", getDisplayName()));
+			}
 			
-			player.sendMessage(plugin.getI18n().t("team.removeplayer.removed", getDisplayName()));
 			unregisterPlayer(player);
 		}