Simplify failure handling