Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java	(revision 33103)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java	(revision 33104)
@@ -360,11 +360,13 @@
         List<Way> resultList = new ArrayList<>();
 
-        List<OsmPrimitive> nodeReferrers = node.getReferrers();
-
-        for (OsmPrimitive referrer : nodeReferrers) {
-            if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
-                Way neighborWay = (Way) referrer;
-                if (neighborWay != way && containsWay(neighborWay)) {
-                    resultList.add(neighborWay);
+        if (node != null) {
+            List<OsmPrimitive> nodeReferrers = node.getReferrers();
+
+            for (OsmPrimitive referrer : nodeReferrers) {
+                if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
+                    Way neighborWay = (Way) referrer;
+                    if (neighborWay != way && containsWay(neighborWay)) {
+                        resultList.add(neighborWay);
+                    }
                 }
             }
Index: /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java	(revision 33103)
+++ /applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java	(revision 33104)
@@ -11,5 +11,4 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -39,7 +38,5 @@
         for (TestError e: errors) {
             assertEquals(e.getCode(), PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE);
-            @SuppressWarnings("unchecked")
-            List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-            Way way = (Way) highlighted.get(0);
+            Way way = (Way) e.getHighlighted().iterator().next();
             assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
         }