Fix error message only if no body is retuned Upstream-commit: 045462a36742a7821dd277eb63fc61a840451424 Component: engine