diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index dea81a9c5d..38fdcf83ef 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
         {
             m_agentCircuitsByUUID.TryRemove(ac.AgentID, out AgentCircuitData dummy);
             m_agentCircuits.TryRemove(ac.circuitcode, out AgentCircuitData dummyb);
-            if (dummy.circuitcode != ac.circuitcode) //??
+            if (dummy!= null && dummy.circuitcode != ac.circuitcode) //??
                 m_agentCircuits.TryRemove(dummy.circuitcode, out AgentCircuitData dummyc);
         }