TEIIDDES-2250 add appropriate null check