diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index 47fc409a2a..96b1b30182 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,12 @@ License
 
 #include "ListOps.H"
 
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const Foam::labelList Foam::emptyLabelList = Foam::labelList(0);
+
+
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 Foam::labelList Foam::invert
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 98cb8cf89e..ce16f5431a 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,6 +43,16 @@ SourceFiles
 namespace Foam
 {
 
+extern const labelList emptyLabelList;
+
+//- Return reference to zero-sized list. Compare to List::null() which returns
+//  null pointer cast as list reference.
+template<class Type>
+static const List<Type>& emptyList()
+{
+    return *reinterpret_cast<const List<Type>* >(&emptyLabelList);
+}
+
 //- Renumber the values (not the indices) of a list.
 //  Negative ListType elements are left as is.
 template<class ListType>
diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/meshTools/indexedOctree/indexedOctree.C
index c251ccfc44..2f1e13648b 100644
--- a/src/meshTools/indexedOctree/indexedOctree.C
+++ b/src/meshTools/indexedOctree/indexedOctree.C
@@ -2497,7 +2497,7 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
 
 
 template <class Type>
-Foam::label Foam::indexedOctree<Type>::find(const point& sample) const
+Foam::label Foam::indexedOctree<Type>::findInside(const point& sample) const
 {
     labelBits index = findNode(0, sample);
 
@@ -2526,7 +2526,7 @@ Foam::label Foam::indexedOctree<Type>::find(const point& sample) const
 
 
 template <class Type>
-Foam::labelList Foam::indexedOctree<Type>::findIndices
+const Foam::labelList& Foam::indexedOctree<Type>::findIndices
 (
     const point& sample
 ) const
@@ -2544,7 +2544,7 @@ Foam::labelList Foam::indexedOctree<Type>::findIndices
     }
     else
     {
-        return labelList(0);
+        return emptyList<label>();
     }
 }
 
diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/meshTools/indexedOctree/indexedOctree.H
index 74a3fdf844..6d7f425176 100644
--- a/src/meshTools/indexedOctree/indexedOctree.H
+++ b/src/meshTools/indexedOctree/indexedOctree.H
@@ -552,11 +552,12 @@ public:
             //  Use getNode and getOctant to extract info, or call findIndices.
             labelBits findNode(const label nodeI, const point&) const;
 
-            //- Find shape containing point in tree
-            label find(const point&) const;
+            //- Find shape containing point. Only implemented for certain
+            //  shapes.
+            label findInside(const point&) const;
 
             //- Find the shape indices that occupy the result of findNode
-            labelList findIndices(const point&) const;
+            const labelList& findIndices(const point&) const;
 
             //- Determine type (inside/outside/mixed) for point. unknown if
             //  cannot be determined (e.g. non-manifold surface)
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index a326030f89..84315fa869 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -745,7 +745,7 @@ Foam::label Foam::meshSearch::findCell
     {
         if (useTreeSearch)
         {
-            return cellTree().find(location);
+            return cellTree().findInside(location);
         }
         else
         {