Updating mailer module
Adding extra error msgs
Adding extra error msgs