Eliminate Risk Before the Step, Not After