added case for null lat/long values