1 files changed, 10 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index db94d2a..0bd68dd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -148,13 +148,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
         private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
         {
             ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-            if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
+            try
             {
-                avatar.Invulnerable = false;
+                if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
+                {
+                    avatar.Invulnerable = false;
+                }
+                else
+                {
+                    avatar.Invulnerable = true;
+                }
             }
-            else
+            catch (Exception ex)
             {
-                avatar.Invulnerable = true;
             }
         }
     }