Clean up failure handling