2 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index aa2423f..f0fd74b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -199,6 +199,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             int numCollected = 0;
             //First of all make sure our packet queue isn't above our threshold 
+            if (m_client == null)
+                return;
+
+            if (m_client.PacketHandler == null)
+                return;
+
+            if (m_client.PacketHandler.PacketQueue == null)
+                return;
+
+
             if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < 200)
             {
                 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 3b9d293..26a8959 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -378,6 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     case SocketError.NetworkReset:
                     case SocketError.ConnectionReset:
+                    case SocketError.OperationAborted:
                         break;
 
                     default: