FIx mail method so it returns null rather than throwing null