Better handling of server connection timeout.