JBIDE-16052 - null checks