More fault-tolerate error handling