Changed Mail Creator to not get nulls sometimes.