DF#QCADOOMES-1952 fix npe