Increased robustness due to better handling of timeouts