Added error template improves