diff --git a/README.md b/README.md
index 537ddfa..5e58206 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,6 @@ Heed their warning and do not blindly follow the gps track! Use your brain and
 plan your route beforehand to be aware of dangerous parts and alternatives. 
 
 Take a look at their [safety instructions](https://www.sac-cas.ch/en/training-and-safety/safety/).
+
+## Contributors
+- wizche
diff --git a/background.js b/background.js
index 7afc979..95ccd76 100644
--- a/background.js
+++ b/background.js
@@ -89,9 +89,10 @@ function trackTitle(geoJson) {
  */
 function toGpx(geoJson) {
   let trackSegments = geoJson.segments.map((segment) => {
+    if (segment.geom == null) return "";
     return `<trkseg>
-            ${segment.geom.coordinates.map(toTrackPoint).join("")}
-        </trkseg>`;
+             ${segment.geom.coordinates.map(toTrackPoint).join("")}
+         </trkseg>`;
   }).join("");
 
   let endPoint = geoJson.end_point ? toWayPoint(geoJson.end_point) : "";
diff --git a/manifest.json b/manifest.json
index 60ddb60..b738a29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
 
     "manifest_version": 2,
     "name": "SAC Route Portal GPX Downloader",
-    "version": "0.6",
+    "version": "0.7",
     "developer": {
         "name": "Sebastian Hugentobler",
         "url": "https://code.vanwa.ch/sebastian/sac-route-portal-gpx-fx"