Fixed bug in data generation causing delivery points to be null