Fixed KT-5493: NPE fix