HEMERA-3691: Improve error handling on data association