LILY-1693 Handle missing OCC values from upgrades