Added catching of the errors for Mailcatcher if HTML or Plain version of the message is not provided.
39a5e13