Merge "Stop cascading failure from setup fail"