Add more fault-tolerance to ASO.

As per subject.