1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 043d337..466b20a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -410,7 +410,14 @@ namespace OpenSim.Region.Environment.Scenes
             RegisterToEvents();
             SetDirectionVectors();
 
-            m_scene.LandChannel.SendLandUpdate(this, true);
+            try
+            {
+                m_scene.LandChannel.SendLandUpdate(this, true);
+            } //BUG: Mike - please fix this.
+            catch (KeyNotFoundException)
+            {
+                m_log.Warn("[LAND]: Bug triggered with NPC. LandModule needs a refactor to fix this.");
+            }
         }
 
         public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,