Fixed a null problem

There was an error while the server started for the first time.
Merge pull request #26 from EhudB/master

Fixed a NullPointerException