diff --git a/src/main/groovy/au/org/ala/ecodata/converter/FeatureConverter.groovy b/src/main/groovy/au/org/ala/ecodata/converter/FeatureConverter.groovy
index 3a4cae88a..3b154a87f 100644
--- a/src/main/groovy/au/org/ala/ecodata/converter/FeatureConverter.groovy
+++ b/src/main/groovy/au/org/ala/ecodata/converter/FeatureConverter.groovy
@@ -31,14 +31,14 @@ class FeatureConverter  implements RecordFieldConverter {
     }
 
     static Double getDecimalLatitude (Map data) {
-        switch (data.type) {
+        switch (data?.type) {
             case 'Point':
                 return data.coordinates[1]
         }
     }
 
     static Double getDecimalLongitude (Map data) {
-        switch (data.type) {
+        switch (data?.type) {
             case 'Point':
                 return data.coordinates[0]
         }