Update BuildCheckpoints error checking