diff --git a/Core/src/main/java/fr/pandacube/lib/core/players/IPlayerManager.java b/Core/src/main/java/fr/pandacube/lib/core/players/IPlayerManager.java
index 978b8a9..6f37aeb 100644
--- a/Core/src/main/java/fr/pandacube/lib/core/players/IPlayerManager.java
+++ b/Core/src/main/java/fr/pandacube/lib/core/players/IPlayerManager.java
@@ -115,12 +115,13 @@ public abstract class IPlayerManager<OP extends IOnlinePlayer, OF extends IOffPl
 	
 	public List<OP> getOnlyVisibleFor(OF viewer) {
 		List<OP> players = getAll();
-		players.removeIf(op -> op.isVanishedFor(viewer));
+		if (viewer != null)
+			players.removeIf(op -> op.isVanishedFor(viewer));
 		return players;
 	}
 	
 	public List<OP> getOnlyVisibleFor(OP viewer, boolean sameServerOnly) {
-		if (sameServerOnly && viewer.getServerName() == null)
+		if (sameServerOnly && (viewer == null || viewer.getServerName() == null))
 			return Collections.emptyList();
 		
 		@SuppressWarnings("unchecked")