fixed template errors on prod
added error templates