1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 43167ee..f40948f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1635,9 +1635,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bool ready = false;
                 while (!ready && count-- > 0)
                 {
-                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive)
+                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive && client.SceneAgent != null)
                     {
-                        LLUDPClient udpClient = ((LLClientView)client).UDPClient;
+                        LLClientView llClientView = (LLClientView)client;
+                        LLUDPClient udpClient = llClientView.UDPClient;
                         if (udpClient != null && udpClient.IsConnected)
                             ready = true;
                         else