Dealing better with None metadata in the harvester.