Fix subfieldset error checking