Merge "Remove stash handling when other errors are the problem"