Improve error management during generation of the template