Added handling for HTTP timeouts