* Fixes NB#90487, adds a required NULL check