Add length check to ensure V2 data is actually present.