Better behavior when timing out on the client