cherry-pick-oserror-bugfix
