NXP-16052: clean up exceptions