Return an error instead of an `*InvalidTemplateError` Upstream-commit: bb1a403080 Component: cli
bb1a403080