Add catch clauses for Template