One level deeper into the template refactor
Reenable error handling