Improve error message for 404 returned by daemon Upstream-commit: 6dd1bb9eb08dc144bc172b0052df7c3904896e56 Component: engine