Improve fault tolerance