diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 75a3642f57..da22123193 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -5,3 +5,4 @@
 - Write empty geometry with the shapefile driver
 - Do not ask for SRID when geometry is empty
 - Add the name of the table in the FGB header
+- Fix null way id on OSM file
diff --git a/h2gis-functions/src/main/java/org/h2gis/functions/io/osm/WayOSMElement.java b/h2gis-functions/src/main/java/org/h2gis/functions/io/osm/WayOSMElement.java
index 3012863bb7..93e2ea4367 100644
--- a/h2gis-functions/src/main/java/org/h2gis/functions/io/osm/WayOSMElement.java
+++ b/h2gis-functions/src/main/java/org/h2gis/functions/io/osm/WayOSMElement.java
@@ -42,7 +42,9 @@ public WayOSMElement() {
      * @param ref
      */
     public void addRef(String ref) {
-        nodesRef.add(Long.valueOf(ref));
+        if(ref!=null) {
+            nodesRef.add(Long.valueOf(ref));
+        }
     }
 
     /**