This change ensures connection errors are handled explicitly for cases where there are network issues. In addition to the above, this includes type hint updates and minor refactor.
