Improved handling of read timeout