diff --git a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
index b26cc6534bbc68bc76e5a57c0200036fd90cb6f9..f4f1d56536f230a98cbe0b3ef5d70510dbb3532c 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/distance/DistanceAction.java
@@ -3,6 +3,7 @@ package cz.fidentis.analyst.distance;
 import cz.fidentis.analyst.canvas.Canvas;
 import cz.fidentis.analyst.core.LoadedActionEvent;
 import cz.fidentis.analyst.core.ControlPanelAction;
+import cz.fidentis.analyst.feature.FeaturePoint;
 import cz.fidentis.analyst.feature.FeaturePointType;
 import cz.fidentis.analyst.mesh.core.MeshFacet;
 import cz.fidentis.analyst.scene.DrawableFeaturePoints;
@@ -203,8 +204,12 @@ public class DistanceAction extends ControlPanelAction {
     }
     
     private FeaturePointType getTypeOfFeaturePoint(int index) {
-        return getSecondaryFeaturePoints().getFeaturePoints()
-                .get(index)
+        final List<FeaturePoint> featurePoints = getSecondaryFeaturePoints().getFeaturePoints();
+        if (index < 0 || index >= featurePoints.size()) {
+            return null;
+        }
+        
+        return featurePoints.get(index)
                 .getFeaturePointType();
     }
 }