Improvements to handling no network connectivity exceptions.