CAAERS-6774 fix NPE