Fix error reporting on executor wait Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba Component: engine