Make the code more fault-tolerant.