PIVOT-949, first part of the fix (add a fallback in case something goes wrong in the specific case of this issue)