NXP-16052: clean up throws Exception