NXP-11052: clean up exception handling