Move STONITH check to second pass