1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 84bf54f..9da49f7 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1099,6 +1099,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 // Reset the collision values to false
                 // since we don't know if we're colliding yet
 
+                // For some reason this can happen. Don't ask...
+                //
+                if (chr == null)
+                    continue;
+
                 chr.IsColliding = false;
                 chr.CollidingGround = false;
                 chr.CollidingObj = false;