PAHMA-914 (Part 2): Removes spurious error messages

Adds a check to make sure that pre-existing non-preferred terms don't
cause error messages in KIR/OIR.