Handle better null values in ExtraData