GEODE-6630 fix for release 1.9.0

[Eric Shu]

I'd like to include the fix for the NPE.
It is new in 1.9.
Regards,
Eric