Fixed #13, and crash on server startup #15

Closed vladyslav-vasiliev closed 5 years ago