Replaced "err" with "nil" & added a comment Upstream-commit: 3cfc3e30a886aef1a5e767d5b2a9a7b2c156c5f9 Component: engine