diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index f04ce7fa6c..b3663b7763 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -174,7 +174,9 @@ namespace OpenSim.Region.Environment.Scenes foreach (EntityBase entity in moveEntities) { - entity.UpdateMovement(); + if(entity != null)entity.UpdateMovement(); + //cfk. This throws occaisional exceptions on a heavily used region + //and I added this null check to try to preclude the exception. } }