This MR fixes an Athena job crashes reported in ATLASRECTS-5727.
Resolves ATLASRECTS-5727
Tagging @rmazini @ponyisi @kwhalen