[TA-488] Preventing NPE