improve error message to print the tag Upstream-commit: 6ad1cd5d0f3a27abb3fdb89cc4104328f1b04b49 Component: engine