This is probably easiest to review commit by commit as c5b2da54 introduces a lot of noise and the messages should be fairly clear.
I'm not sure about 6368a604 but I don't see why you would want to give up if an email is bad unless it's to indirectly protect from it not being possible to send email.