- Prevent NPE when server is empty
Merge pull request #2 from Hatventures/master

- Prevent NPE when server is empty