Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 16947)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 16948)
@@ -59,7 +59,7 @@
         if(source instanceof JToggleButton) {
             if(((JToggleButton)source).isSelected()) {
-                markerTitle = markerTitle + " " + tr("start");
+                markerTitle = tr("{0} start", markerTitle);
             } else {
-                markerTitle = markerTitle + " " + tr("end");
+                markerTitle = tr("{0} end", markerTitle);
             }
         }
@@ -84,8 +84,9 @@
         WayPoint waypoint = new WayPoint(event.getCoordinates());
         waypoint.attr.put("name", markerText);
-        waypoint.attr.put("sym", iconName);
+        if(iconName != null)
+            waypoint.attr.put("sym", iconName);
         synchronized(LiveGpsLock.class) {
             //layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
-        layer.data.add(new Marker(event.getCoordinates(), markerText, iconName, null, -1.0, 0.0));
+            layer.data.add(new Marker(event.getCoordinates(), markerText, iconName, null, -1.0, 0.0));
             if(gpsLayer != null) {
                 gpsLayer.data.waypoints.add(waypoint);
@@ -107,5 +108,5 @@
                 // not found, add a new one
                 //markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null);
-        markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null, null);
+                markerLayer = new MarkerLayer(new GpxData(), MARKER_LAYER_NAME, null, null);
                 Main.main.addLayer(markerLayer);
             }