DF#QCADOOMESCLS-709 fixed NPE