JBIDE-18420 - NPE protection