1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index d8cf9a7..54be807 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -85,7 +85,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public byte[] Data
         {
-            get { return m_asset.Data; }
+            get 
+            { 
+                if (m_asset != null) 
+                    return m_asset.Data; 
+                else
+                    return null;
+            }
         }
 
         public ushort TexturePacketCount()