NXP-11820: safer code for null expressions