Improving error handling for the no-internet case