Added support for ETIMEOUT detection