Enhanced failure handling