Fix attempts to map null values