Make server more robust