Fix a core dump that ran all over the regressions last night. This is related to TRQ-1539.