CAAERS-6869 Exception caught but not handled as error in SafetyReport converter
CAAERS-6869 resolving merge conflicts