1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 7352e2d..68a9076 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -67,7 +67,8 @@ namespace OpenSim.Region.Communications.Hypergrid
         public override void SetInventoryService(IInventoryService invService)
         {
             base.SetInventoryService(invService);
-            m_localUserServices.SetInventoryService(invService);
+            if (m_localUserServices != null)
+                m_localUserServices.SetInventoryService(invService);
         }
 
         public override UUID AddUser(