Refactor capturing delivaery failures