make server more robust