CAAERS-6488 - fix NPE