Make client/server more robust to failures.