Increased scope of timeout error handling.