From 2ebf70d719e1db2062a9a55bd1037e43c089276e Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Wed, 5 Jun 2013 20:19:59 -0700
Subject: [PATCH] Strengthen some assumptions.

---
 .../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index e474ef6bdb..58576d1056 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -233,6 +233,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                     if (sp != null)
                     {
                         AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+                        if (aCircuit == null)
+                            return;
+                        if (aCircuit.ServiceURLs == null)
+                            return;
+
                         if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
                         {
                             inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();