diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 22666f4b43..364857516b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             // If we've received a use circuit packet, then we need to decode an endpoint proxy, if one exists, before 
             // allowing the RecvBuffer to be overwritten by the next packet. 
-            if (packet.Type == PacketType.UseCircuitCode)
+            if (packet != null && packet.Type == PacketType.UseCircuitCode)
             {
                 epProxy = epSender;
                 if (proxyPortOffset != 0)