(PE-4372) Add another null check