diff --git a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
index 56b4fb5969..66a2bd1d4f 100644
--- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
@@ -462,12 +462,18 @@ Standard_Boolean BRepExtrema_ProximityValueTool::getShapesAdditionalVertices()
 
     if (myIsRefinementRequired1)
     {
-      return getEdgeAdditionalVertices (TopoDS::Edge (myShape1), aStep1, myAddVertices1, myAddStatus1);
+      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape1), aStep1, myAddVertices1, myAddStatus1))
+      {
+        return Standard_False;
+      }
     }
 
     if (myIsRefinementRequired2)
     {
-      return getEdgeAdditionalVertices (TopoDS::Edge (myShape2), aStep2, myAddVertices2, myAddStatus2);
+      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape2), aStep2, myAddVertices2, myAddStatus2))
+      {
+        return Standard_False;
+      }
     }
   }
   else if ((myShapeType1 == TopAbs_FACE) && (myShapeType2 == TopAbs_FACE))
diff --git a/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx b/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
index 09efa4e585..034f25e66e 100644
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
@@ -129,6 +129,7 @@ void BRepExtrema_ShapeProximity::Perform()
                                     myElementSet2);
     myProxValTool.LoadShapeLists (myShapeList1,
                                   myShapeList2);
+    myProxValTool.SetNbSamplePoints (myNbSamples1, myNbSamples2);
 
     myProxValTool.Perform (myTolerance);
     myProxValTool.ProximityPoints(myProxPoint1, myProxPoint2);