Fixing issue with E-Mail sending
Avoiding NPE that appears in DEV mode
Correct method call