diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index defa934878d..a16add0cc8a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -1079,9 +1079,12 @@ public List<WptPt> setPoints(GpxRouteApproximation gpxApproximation, List<WptPt>
 		return routePoints;
 	}
 
-	private boolean needDuplicatePoint(List<GpxPoint> gpxPoints, int i) {
-		List<RouteSegmentResult> routeToTarget = gpxPoints.get(i).routeToTarget;
-		List<RouteSegmentResult> routeToTargetNext = gpxPoints.get(i + 1).routeToTarget;
+	private boolean needDuplicatePoint(List<GpxPoint> gpxPoints, int index) {
+		if (index == gpxPoints.size() - 1) {
+			return false;
+		}
+		List<RouteSegmentResult> routeToTarget = gpxPoints.get(index).routeToTarget;
+		List<RouteSegmentResult> routeToTargetNext = gpxPoints.get(index + 1).routeToTarget;
 		return routeToTarget.get(routeToTarget.size() - 1).getEndPoint()
 				.equals(routeToTargetNext.get(0).getStartPoint());
 	}