Fix Server crash problem #5