fix macro in template
fix message body when error