handling case of email not found and not sending 500.
Merge branch 'hotfix/v2.3.1'