Make the server a little more robust