Added fix to support null emails