diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index ffdd40f5d2..5657b66e92 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -197,7 +197,13 @@ namespace OpenSim.Framework
         {
             get { return m_textureEntry; }
 
-            set { m_textureEntry = value; }
+            set 
+            { 
+                if (value == null) 
+                    m_textureEntry = new byte[1];
+                else 
+                    m_textureEntry = value; 
+            }
         }