Fixed Issue where nil-checked Mail isn't for Data