2 files changed, 8 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index fac2574..2b5f7a0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -766,9 +766,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
                 catch (IndexOutOfRangeException)
                 {
-                    m_log.WarnFormat(
-                        "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", 
-                        x, y, m_scene.RegionInfo.RegionName);
+//                    m_log.WarnFormat(
+//                        "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", 
+//                        x, y, m_scene.RegionInfo.RegionName);
                     
                     return null;
                 }
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index d1e2328..f07ae31 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -183,6 +183,11 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             Vector3 pos = obj.AbsolutePosition;
             ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
+            
+            // If for some reason there is no land object (perhaps the object is out of bounds) then we can't count it
+            if (landObject == null)
+                return;
+            
             LandData landData = landObject.LandData;
             
 //            m_log.DebugFormat(