Added check for email == null