Improve incremental_template error management
Add missing restart