Improved error handling and refreshing when coming back from changing settings.