convert third-party exception to ConnectionError

fixes bug #1207635

Change-Id: I37da522e812286e72706409b8a6d4652515f720f
Merge "convert third-party exception to ConnectionError"