Updated error checking to include new unit challenge fields