Improve no network connectivity case