Merge fix for TRQ-2378: MOM crash on obit handling.