Improved robustness to timeouts