Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35825)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35978)
@@ -12,5 +12,4 @@
 
 import org.openstreetmap.josm.data.DataSource;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -200,8 +199,7 @@
                     bi.addId(id - lastid);
                     lastid = id;
-                    LatLon coor = i.getCoor();
-                    if (coor != null) {
-                        int lat = mapDegrees(coor.lat());
-                        int lon = mapDegrees(coor.lon());
+                    if (i.isLatLonKnown()) {
+                        int lat = mapDegrees(i.lat());
+                        int lon = mapDegrees(i.lon());
                         bi.addLon(lon - lastlon);
                         lastlon = lon;
@@ -235,7 +233,6 @@
                 for (Node i : contents) {
                     long id = i.getUniqueId();
-                    LatLon coor = i.getCoor();
-                    int lat = mapDegrees(coor.lat());
-                    int lon = mapDegrees(coor.lon());
+                    int lat = mapDegrees(i.lat());
+                    int lon = mapDegrees(i.lon());
                     Osmformat.Node.Builder bi = Osmformat.Node.newBuilder();
                     bi.setId(id);
@@ -385,5 +382,5 @@
                     nodes = new NodeGroup();
                 }
-                if (node.getCoor() != null) {
+                if (node.isLatLonKnown()) {
                     nodes.add(node);
                     checkLimit();