Fixed up all of the error stuff, as almost all of the previous usage became incompatible with the reset changes.