Added support for handling ConnectionError