diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
index 24e02f5ebb0d2555d9f23fd453ca11b023640bd4..64362f5805a2c7c46855920332dfabb4e48b8a4f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
@@ -306,7 +306,7 @@ void Foam::snappySnapDriver::calcNearestFace
         (
             labelList(1, zoneSurfi),
             fc,
-            sqr(faceSnapDist),// sqr of attract dist
+            sqr(scalarField(faceSnapDist, ppFaces)),// sqr of attract dist
             hitSurface,
             hitInfo,
             hitRegion,
@@ -382,7 +382,7 @@ void Foam::snappySnapDriver::calcNearestFace
     (
         unzonedSurfaces,
         fc,
-        sqr(faceSnapDist),// sqr of attract dist
+        sqr(scalarField(faceSnapDist, ppFaces)),// sqr of attract dist
         hitSurface,
         hitInfo,
         hitRegion,
diff --git a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
index df5234dc1ae329e456a1835627dae12dd2c43a3d..a4bd237f6aa683615b836fb40826f1afb91bc82f 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
@@ -354,6 +354,13 @@ void Foam::searchableSurfacesQueries::findNearest
 {
     // Find nearest. Return -1 or nearest point
 
+    if (samples.size() != nearestDistSqr.size())
+    {
+        FatalErrorInFunction << "Inconsistent sizes. samples:" << samples.size()
+            << " search-radius:" << nearestDistSqr.size()
+            << exit(FatalError);
+    }
+
     // Initialise
     nearestSurfaces.setSize(samples.size());
     nearestSurfaces = -1;
@@ -405,6 +412,14 @@ void Foam::searchableSurfacesQueries::findNearest
 {
     // Find nearest. Return -1 or nearest point
 
+    if (samples.size() != nearestDistSqr.size())
+    {
+        FatalErrorInFunction << "Inconsistent sizes. samples:" << samples.size()
+            << " search-radius:" << nearestDistSqr.size()
+            << exit(FatalError);
+    }
+
+
     if (regionIndices.empty())
     {
         findNearest
@@ -468,6 +483,15 @@ void Foam::searchableSurfacesQueries::findNearest
 {
     // Multi-surface findNearest
 
+
+    if (start.size() != distSqr.size())
+    {
+        FatalErrorInFunction << "Inconsistent sizes. samples:" << start.size()
+            << " search-radius:" << distSqr.size()
+            << exit(FatalError);
+    }
+
+
     vectorField normal;
     List<pointIndexHit> info;