From af1fa958756a2c76810847a2059befa071956d09 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 May 2013 11:36:17 -0700
Subject: Groups: Improve error handling on remote connector.

---
 .../Addons/Groups/Remote/GroupsServiceRobustConnector.cs    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Addons/Groups')

diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index f991d01..28f7acc 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -170,11 +170,16 @@ namespace OpenSim.Groups
 
                 }
 
-                grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
-                if (grec == null)
-                    NullResult(result, "Internal Error");
+                if (grec.GroupID != UUID.Zero)
+                {
+                    grec = m_GroupsService.GetGroupRecord(RequestingAgentID, grec.GroupID);
+                    if (grec == null)
+                        NullResult(result, "Internal Error");
+                    else
+                        result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                }
                 else
-                    result["RESULT"] = GroupsDataUtils.GroupRecord(grec);
+                    NullResult(result, reason);
             }
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-- 
cgit v1.1