Better checks in email module