Make server more robust.