Get rid of err altogether by just returning the assignment Upstream-commit: 96ac223a1373848b1e5532af6a9887a2ede17de8 Component: engine