2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
index a537067..41897eb 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGInventoryServerInConnector.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
         /// <returns></returns>
         public override bool CheckAuthSession(string session_id, string avatar_id)
         {
-            m_log.InfoFormat("[HG INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id);
+            //m_log.InfoFormat("[HG INVENTORY IN CONNECTOR]: checking authed session {0} {1}", session_id, avatar_id);
             // This doesn't work
 
         //    if (m_session_cache.getCachedSession(session_id, avatar_id) == null)
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 0873a2b..97e3705 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -152,7 +152,9 @@ namespace OpenSim.Services.HypergridService
             {
                 List<UUID> travels = new List<UUID>();
                 foreach (KeyValuePair<UUID, TravelingAgentInfo> kvp in m_TravelingAgents)
-                    if (kvp.Value.UserID == userID)
+                    if (kvp.Value == null) // do some clean up
+                        travels.Add(kvp.Key);
+                    else if (kvp.Value.UserID == userID)
                         travels.Add(kvp.Key);
                 foreach (UUID session in travels)
                     m_TravelingAgents.Remove(session);