NXP-10359: avoid NPE