Fixing for new DataUnitHelpers do not throw close exception