Get rid of some of the abstract error checking junk