NXP-16052: Clean up throws Exception in runtime