NXP-16052: clean up "catch Exception"