[PATCH v2 0/6] Enhance event delivery error handling