Ensure the email fields are not set to null Bug: 12506.