DF#QCADOOCLS-980 NPE during operation remove