[PATCH 4/4] only clear errors if re-running the check (#868707)