CAAERS-4881 fix NPE, update all AEs added to report