diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 570ebe9cb6..321c2ffe15 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -380,6 +380,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //Slave regions don't accept new clients
             if (m_localScene.Region_Status != RegionStatus.SlaveScene)
             {
+				if (!(packet is UseCircuitCodePacket))
+					return;
                 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
                 lock (clientCircuits)
                 {