Fixed where a email may not be present