Changes for send mail error