One thing I discovered when looking at D15484. Not that this is only on error handling, so on things like RabbitMQ problems, and this code shouldn't be executed a lot so we shouldn't worry that this caused persistence ofa huge amount of non-deleted messages.

Ask Tomek to run this code