These errors has shown how important it to have automated tests.

Simple tests for the retry condition would have caught all these recent errors. :-(