Fixed #169 - Server crash