Make sure the mailTransport property is exist
Merge branch 'clean-up'