1 files changed, 17 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 70e7af5..ff9df37 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -931,18 +931,25 @@ namespace OpenSim.Region.Framework.Scenes
 
             // ----------------------------------
             // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
-            if (gm != null)
+            try
+            {
+                if (gm != null)
+                {
+                    groupUUID = ControllingClient.ActiveGroupId;
+                    GroupRecord record = gm.GetGroupRecord(groupUUID);
+                    if (record != null)
+                        GroupName = record.GroupName;
+                    GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
+                    if (groupMembershipData != null)
+                        groupPowers = groupMembershipData.GroupPowers;
+                }
+                ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
+                                                      Grouptitle);
+            }
+            catch (Exception e)
             {
-                groupUUID = ControllingClient.ActiveGroupId;
-                GroupRecord record = gm.GetGroupRecord(groupUUID);
-                if (record != null)
-                    GroupName = record.GroupName;
-                GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
-                if (groupMembershipData != null)
-                    groupPowers = groupMembershipData.GroupPowers;
+                m_log.Debug("[AGENTUPDATE]: " + e.ToString());
             }
-            ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
-                                      Grouptitle);
             // ------------------------------------
 
             if (ParentID == 0)