diff --git a/geocsv.cpp b/geocsv.cpp
index cd70025..dcf1f87 100644
--- a/geocsv.cpp
+++ b/geocsv.cpp
@@ -61,10 +61,18 @@ void parse_geocsv(std::vector<struct serialization_state> &sst, std::string fnam
 		std::vector<std::string> line = csv_split(s.c_str());
 
 		if (line.size() != header.size()) {
-			fprintf(stderr, "%s:%zu: Mismatched column count: %zu in line, %zu in header\n", fname.c_str(), seq, line.size(), header.size());
+			fprintf(stderr, "%s:%zu: Mismatched column count: %zu in line, %zu in header\n", fname.c_str(), seq + 1, line.size(), header.size());
 			exit(EXIT_FAILURE);
 		}
 
+                if (line[loncol].empty() || line[latcol].empty()) {
+                    static int warned = 0;
+                    if (!warned) {
+                        fprintf(stderr, "%s:%zu: null geometry (additional not reported)\n", fname.c_str(), seq + 1);
+                        warned = 1;
+                    }
+                    continue;
+                }
 		double lon = atof(line[loncol].c_str());
 		double lat = atof(line[latcol].c_str());
 
diff --git a/tests/csv/ne_110m_populated_places_simple.csv b/tests/csv/ne_110m_populated_places_simple.csv
index 9b79c12..7c98023 100644
--- a/tests/csv/ne_110m_populated_places_simple.csv
+++ b/tests/csv/ne_110m_populated_places_simple.csv
@@ -242,3 +242,4 @@ scalerank,natscale,labelrank,featurecla,name,namepar,namealt,diffascii,nameascii
 0,600,3,Admin-1 capital,Sydney,,,0,Sydney,0.00000000000,,,1.00000000000,1,Australia,AUS,Australia,AUS,New South Wales,AU,,-33.92001096720,151.18517980900,4.00000000000,0,Changed feature class.,4630000,3641422,2669348,12,12,2147714.00000000000,Sydney,Sydney1,1,0,1.7
 0,600,0,Admin-0 capital,Singapore,,,0,Singapore,1.00000000000,,,1.00000000000,1,Singapore,SGP,Singapore,SGP,,SG,,1.29303346649,103.85582067800,0.00000000000,0,,5183700,3289529,3314179,13,12,1880252.00000000000,Singapore,Singapore,1,5,2.1
 0,600,0,Admin-0 region capital,Hong Kong,,,0,Hong Kong,0.00000000000,,,1.00000000000,1,China,CHN,Hong Kong S.A.R.,HKG,,HK,,22.30498089500,114.18500931700,0.00000000000,0,,7206000,4551579,4549026,13,12,1819729.00000000000,Hong Kong,Hong Kong,1,0,3.0
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,