JBIDE-16052 - allowing additions to as7/wf cp

JBIDE-16052 - null checks