1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 42bb783..96a274c 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5293,7 +5293,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                             //if (handlerTextureRequest != null)
                                 //OnRequestTexture(this, args);
-                            m_imageManager.EnqueueReq(args);
+
+                            // in the end, we null this, so we have to check if it's null
+                            if (m_imageManager != null)
+                                m_imageManager.EnqueueReq(args);
                         }
                     }
                     break;