R1:a3f380a6952f

Make setup check groups more robust against fataling existing subclasses

Auditors: chad