1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
index 9f829da..4f1e9f7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             LSL_List result = new LSL_List();
             foreach (ScenePresence avatar in World.GetAvatars())
             {
-                if (avatar.UUID != m_host.OwnerID)
+                if (avatar != null && avatar.UUID != m_host.OwnerID)
                 {
                     if (avatar.IsChildAgent == false)
                     {