Fixing bug where connectivity failure would raise an exception.