NXP-12827: add return statements