diff --git a/lib/vectortilefeature.js b/lib/vectortilefeature.js
index b9880a1..e925ad8 100644
--- a/lib/vectortilefeature.js
+++ b/lib/vectortilefeature.js
@@ -55,6 +55,7 @@ VectorTileFeature.prototype.loadGeometry = function() {
             var cmdLen = pbf.readVarint();
             cmd = cmdLen & 0x7;
             length = cmdLen >> 3;
+            if (!length) {break;}
         }
 
         length--;