merge fixes
Error Mailer