* Added null root part guard

* Normalized some UUID handling
* Compacted a few Contains/Add into Set

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 47c4567..e295f87 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -123,7 +123,15 @@ namespace OpenSim.Region.Environment.Scenes
 
         public override LLVector3 AbsolutePosition
         {
-            get { return m_rootPart.GroupPosition; }
+            get
+            {
+                if( m_rootPart == null )
+                {
+                    throw new NullReferenceException(string.Format("Object {0} has no root part.", m_uuid));
+                }
+
+                return m_rootPart.GroupPosition;
+            }
             set
             {
                 LLVector3 val = value;