diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 1204cd477c..2c3e76789e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -239,7 +239,14 @@ namespace OpenSim.Region.Environment.Scenes public override UUID UUID { - get { return m_rootPart.UUID; } + get { + if (m_rootPart == null) + { + m_log.Error("Got a null rootpart while requesting UUID. Called from: ", new Exception()); + return UUID.Zero; + } + else return m_rootPart.UUID; + } set { m_rootPart.UUID = value; } }