yes and I agree we should use one. This PR just fixes the stack traces and allows to reuse templates.