Add ConnectException and additional test