diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
index 8e35c0cb6..266838d0a 100644
--- a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
+++ b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
@@ -275,7 +275,10 @@ public void setObjectId(Integer objectId) throws ArcgisException {
     public JsonObject toJson() {
         JsonObject resultJSON = new JsonObject();
 
-        resultJSON.add(GEOMETRY_TAG, this.getGeometry().toJSON());
+        Geometry geo = this.getGeometry();
+        if (geo) {
+            resultJSON.add(GEOMETRY_TAG, geo.toJSON());
+        }
 
         JsonObject attributes = new JsonObject();
         for (Map.Entry<String, Object> attribute : this.attributes.entrySet()) {