Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33407)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/AddStopPositionAction.java	(revision 33408)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 
@@ -50,10 +51,8 @@
 
     private static Cursor getCursor() {
-        try {
-            return ImageProvider.getCursor("crosshair", "bus");
-        } catch (Exception e) {
-            Main.error(e);
-        }
-        return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+    	Cursor cursor = ImageProvider.getCursor("crosshair", "bus");
+    	if(cursor == null)
+    		cursor = Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR);
+    	return cursor;
     }
 
@@ -73,5 +72,5 @@
 
     @Override
-    public void mouseMoved (MouseEvent e) {
+    public void mouseMoved(MouseEvent e) {
 
     	//while the mouse is moving, surroundings are checked
@@ -88,5 +87,5 @@
     				Main.map.mapView.getNearestWaySegments(e.getPoint(), OsmPrimitive::isSelectable);
 
-    		if(wss.size() > 0) {
+    		if(!wss.isEmpty()) {
 	    		for(WaySegment ws : wss) {
 	    			newHighlights.add(ws.way);
@@ -101,5 +100,5 @@
 
     @Override
-    public void mouseClicked (MouseEvent e) {
+    public void mouseClicked(MouseEvent e) {
 
     	Boolean newNode = false;
@@ -150,20 +149,21 @@
     private void updateHighlights()
     {
-    	if(oldHighlights.size() > 0 || newHighlights.size() > 0) {
+    	if(oldHighlights.isEmpty() && newHighlights.isEmpty()) {
+    		return;
+    	}
 
-    		for(OsmPrimitive osm : oldHighlights) {
-        		osm.setHighlighted(false);
-        	}
+		for(OsmPrimitive osm : oldHighlights) {
+    		osm.setHighlighted(false);
+    	}
 
-        	for(OsmPrimitive osm : newHighlights) {
-        		osm.setHighlighted(true);
-        	}
+    	for(OsmPrimitive osm : newHighlights) {
+    		osm.setHighlighted(true);
+    	}
 
-    		Main.getLayerManager().getEditLayer().invalidate();
+		Main.getLayerManager().getEditLayer().invalidate();
 
-        	oldHighlights.clear();
-        	oldHighlights.addAll(newHighlights);
-        	newHighlights.clear();
-    	}
+    	oldHighlights.clear();
+    	oldHighlights.addAll(newHighlights);
+    	newHighlights.clear();
     }
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java	(revision 33407)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EdgeSelectionAction.java	(revision 33408)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33407)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SplitRoundaboutAction.java	(revision 33408)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.actions;
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33407)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33408)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant.gui;
 
@@ -11,8 +12,8 @@
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
-public class PTAssistantLayerManager implements SelectionChangedListener{
+public class PTAssistantLayerManager implements SelectionChangedListener {
 
-	public static PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
-    private PTAssistantLayer layer;
+	public final static PTAssistantLayerManager PTLM = new PTAssistantLayerManager();
+	private PTAssistantLayer layer;
 
     public PTAssistantLayer getLayer() {
@@ -23,6 +24,5 @@
     }
 
-    public void resetLayer()
-    {
+    public void resetLayer() {
     	layer = null;
     }
@@ -37,8 +37,7 @@
 
         for (OsmPrimitive primitive : newSelection) {
-            if (primitive.getType().equals(OsmPrimitiveType.RELATION)) {
-                if (RouteUtils.isTwoDirectionRoute((Relation) primitive)) {
+            if (primitive.getType().equals(OsmPrimitiveType.RELATION)
+            		&& RouteUtils.isTwoDirectionRoute((Relation) primitive)) {
                     routes.add(primitive);
-                }
             }
         }