Move error tracking to the common base class.