Replace error checking by CPEs