Handle nulls in mapping service