Use track_errors instead of hand rolling
#59358
Merged
track_errors instead of hand rolling
#59358