Improved client timeout handling.