NXP-4803: Fix NPE