diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java
index 4d63d890..5420725a 100644
--- a/src/com/massivecraft/mcore/util/PlayerUtil.java
+++ b/src/com/massivecraft/mcore/util/PlayerUtil.java
@@ -115,6 +115,7 @@ public class PlayerUtil implements Listener
 	
 	public static boolean isJoined(Player player)
 	{
+		if (player == null) throw new NullPointerException("player was null");
 		return joinedPlayerNames.contains(player.getName());
 	}