Added additional null check for email
4/15 updates