diff --git a/src/vertex_adapters.cpp b/src/vertex_adapters.cpp
index 353ebaa8e..e9d960b76 100644
--- a/src/vertex_adapters.cpp
+++ b/src/vertex_adapters.cpp
@@ -145,6 +145,12 @@ unsigned polygon_vertex_adapter<T>::vertex(coordinate_type * x, coordinate_type
     {
         current_index_ = 0;
         end_index_ = poly_[rings_itr_].size();
+        if (end_index_ == 0)
+        {
+            *x = 0;
+            *y = 0;
+            return mapnik::SEG_CLOSE;
+        }
         point<T> const& coord = poly_[rings_itr_][current_index_++];
         *x = coord.x;
         *y = coord.y;
diff --git a/test/unit/vertex_adapter/vertex_adapter.cpp b/test/unit/vertex_adapter/vertex_adapter.cpp
index 6fe6dda44..4c79e6bb3 100644
--- a/test/unit/vertex_adapter/vertex_adapter.cpp
+++ b/test/unit/vertex_adapter/vertex_adapter.cpp
@@ -268,4 +268,70 @@ SECTION("polygon with hole") {
     REQUIRE( y == 0 );
 }
 
+SECTION("polygon with empty exterior ring") {
+    mapnik::geometry::polygon<double> g;
+    g.emplace_back();
+
+    mapnik::geometry::polygon_vertex_adapter<double> va(g);
+    double x,y;
+    unsigned cmd;
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_END );
+    CHECK( x == Approx(0) );
+    CHECK( y == Approx(0) );
+}
+
+SECTION("polygon with empty interior ring") {
+    mapnik::geometry::polygon<double> g;
+    g.emplace_back();
+    g.back().emplace_back(-1, -1);
+    g.back().emplace_back( 1, -1);
+    g.back().emplace_back( 1,  1);
+    g.back().emplace_back(-1,  1);
+    g.back().emplace_back(-1, -1);
+
+    // Emplace empty interior ring
+    g.emplace_back();
+
+    mapnik::geometry::polygon_vertex_adapter<double> va(g);
+    double x,y;
+    unsigned cmd;
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_MOVETO );
+    CHECK( x == Approx(-1) );
+    CHECK( y == Approx(-1) );
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_LINETO );
+    CHECK( x == Approx(1) );
+    CHECK( y == Approx(-1) );
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_LINETO );
+    CHECK( x == Approx(1) );
+    CHECK( y == Approx(1) );
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_LINETO );
+    CHECK( x == Approx(-1) );
+    CHECK( y == Approx(1) );
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_CLOSE );
+    CHECK( x == Approx(0) );
+    CHECK( y == Approx(0) );
+
+    cmd = va.vertex(&x,&y);
+    CHECK( cmd == mapnik::SEG_CLOSE );
+    CHECK( x == Approx(0) );
+    CHECK( y == Approx(0) );
+
+    cmd = va.vertex(&x,&y);
+    REQUIRE( cmd == mapnik::SEG_END );
+    REQUIRE( x == Approx(0) );
+    REQUIRE( y == Approx(0) );
+}
+
 }