diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 29d8b3d4c9..7ed5ea5ed0 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -496,6 +496,11 @@ namespace OpenSim.Services.HypergridService
         {
             foreach (TravelingAgentInfo t in m_TravelingAgents.Values)
             {
+                if (t == null)
+                {
+                    m_log.ErrorFormat("[USER AGENT SERVICE]: Oops! Null TravelingAgentInfo. Please report this on mantis");
+                    continue;
+                }
                 if (t.UserID == userID && !m_GridName.Equals(t.GridExternalName))
                     return t.GridExternalName;
             }