Index: applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java
===================================================================
--- applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java	(revision 33441)
+++ applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java	(revision 33442)
@@ -185,9 +185,18 @@
         }
 
-        boolean reverse = prev.firstNode().equals(way.lastNode())
-                || prev.lastNode().equals(way.lastNode());
+        boolean reverse = prev != null &&
+                (prev.firstNode().equals(way.lastNode())
+                        || prev.lastNode().equals(way.lastNode()));
 
         if (reverse)
             Collections.reverse(nodes);
+
+        List<PTStop> ret = getSortedStops(nodes, closeNodes);
+        ret.addAll(noLocationStops);
+        return ret;
+    }
+
+    private List<PTStop> getSortedStops(List<Node> nodes,
+            Map<Node, List<PTStop>> closeNodes) {
 
         List<PTStop> ret = new ArrayList<>();
@@ -208,5 +217,4 @@
         }
 
-        ret.addAll(noLocationStops);
         return ret;
     }