1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 4997923..d130e1f 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -322,11 +322,14 @@ class GpxExport extends AbstractExport {
             gpx.startTag(PREFIX_GROUNDSPEAK, "attributes");
 
             for (String attribute : cache.getAttributes()) {
-                final CacheAttribute attr = CacheAttribute.getByGcRawName(CacheAttribute.trimAttributeName(attribute));
+                final CacheAttribute attr = CacheAttribute.getByRawName(CacheAttribute.trimAttributeName(attribute));
+                if (attr == null) {
+                    continue;
+                }
                 final boolean enabled = CacheAttribute.isEnabled(attribute);
 
                 gpx.startTag(PREFIX_GROUNDSPEAK, "attribute");
-                gpx.attribute("", "id", Integer.toString(attr.id));
+                gpx.attribute("", "id", Integer.toString(attr.gcid));
                 gpx.attribute("", "inc", enabled ? "1" : "0");
                 gpx.text(attr.getL10n(enabled));
                 gpx.endTag(PREFIX_GROUNDSPEAK, "attribute");