diff --git a/src/main/java/electrosphere/net/server/player/PlayerManager.java b/src/main/java/electrosphere/net/server/player/PlayerManager.java
index dae629f4..d0e0d50d 100644
--- a/src/main/java/electrosphere/net/server/player/PlayerManager.java
+++ b/src/main/java/electrosphere/net/server/player/PlayerManager.java
@@ -40,7 +40,11 @@ public class PlayerManager {
     }
 
     public List<Player> getPlayers(){
-        return new LinkedList<Player>(idMap.values());
+        List<Player> rVal = new LinkedList<Player>();
+        if(idMap != null && idMap.size() > 0){
+            rVal.addAll(idMap.values());
+        }
+        return rVal;
     }
 
     /**