Made server startup more robust against races caused by a previous
server terminating at the same time.

2 files changed