Fix/3 handle mail error