Removed redundant err == nil check Upstream-commit: afc8ae939aabf0e9e348ae62624a1740c8607508 Component: engine