diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cd85bdb107..f695b83369 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1029,6 +1029,9 @@ public final class CraftServer implements Server {
         Set<OfflinePlayer> result = new LinkedHashSet<OfflinePlayer>();
 
         for (Object name : server.getWhitelisted()) {
+            if (((String)name).length() == 0 || ((String)name).startsWith("#")) {
+                continue;
+            }
             result.add(getOfflinePlayer((String) name));
         }