diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 59782450ad..d3c384321d 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -80,7 +80,10 @@ namespace OpenSim.Framework
         /// Used by ClientView when a 'kick everyone' or 'estate message' occurs
         /// 
         /// <param name="avatarID">AvatarID to lookup</param>
-        /// <returns>true if the presence is a child agent, false if the presence does not exist or is not a child agent</returns>        
+        /// <returns>true if the presence is a child agent, false if the presence is a root exception</returns>
+        /// <exception cref="System.NullReferenceException">
+        /// Thrown if the agent does not exist.
+        /// </exception>
         bool PresenceChildStatus(UUID agentId);
 
         // Diva: get this out of here!!!
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e34c8ec6e4..9d6e3af61b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -333,6 +333,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (m_groupPowers.ContainsKey(groupID))
                 return m_groupPowers[groupID];
+            
             return 0;
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3aa2470abe..8dcd071156 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4133,10 +4133,14 @@ namespace OpenSim.Region.Environment.Scenes
         {
             ScenePresence cp = GetScenePresence(avatarID);
             
-            if (cp != null)
-                return cp.IsChildAgent;
+            // FIXME: This is really crap - some logout code is relying on a NullReferenceException to halt its processing
+            // This needs to be fixed properly by cleaning up the logout code.
+            //if (cp != null)
+            //    return cp.IsChildAgent;
             
-            return false;
+            //return false;
+            
+            return cp.IsChildAgent;
         }
 
         /// <summary>