NXP-16052: clean up exceptions (this sometimes threw NPE)