JBIDE-14993 - soa6 not recognized properly
JBIDE-14993 - potential npe