Discard changes for FetchFailedException and minor modification