Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 16861)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 16862)
@@ -591,5 +591,5 @@
     public synchronized void addWaypoint(WayPoint waypoint) {
         if (privateWaypoints.stream().anyMatch(w -> w == waypoint)) {
-            throw new IllegalArgumentException(MessageFormat.format("The route was already added to this data: {0}", waypoint));
+            throw new IllegalArgumentException(MessageFormat.format("The waypoint was already added to this data: {0}", waypoint));
         }
         privateWaypoints.add(waypoint);
@@ -604,5 +604,5 @@
     public synchronized void removeWaypoint(WayPoint waypoint) {
         if (!privateWaypoints.removeIf(w -> w == waypoint)) {
-            throw new IllegalArgumentException(MessageFormat.format("The route was not in this data: {0}", waypoint));
+            throw new IllegalArgumentException(MessageFormat.format("The waypoint was not in this data: {0}", waypoint));
         }
         invalidate();