[OE-4509] Add workaronud to stop import crashing with NPE.