Add more fault-tolerance to ASO.
Merge pull request #4038 from HassenRiahi/AddRobustness

Add more fault-tolerance to ASO.