Remove unnecessary error returns Upstream-commit: 7de2b49ac86cf92fd2af34f671503118c3cc8b16 Component: engine