CAAERS-6316 fix NPE