NXP-10359: fix check
NXP-10359: avoid NPE