Follow connection error handling change