NXP-15138: Fix NPE