Return better errors from exec Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c Component: engine