Add some error handling to the template