fixed : major prod bug on email raising errors