PIM-2430: Change baseData to null if data is null