2 files changed, 12 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 643764f..678e772 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -285,24 +285,22 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     return;
                 }
 
-                byte[] assetData;
+                byte[] assetData = null;
                 AssetBase oldAsset = null;
                 
                 if (BlendWithOldTexture)
                 {
-                    UUID lastTextureID = part.Shape.Textures.DefaultTexture.TextureID;
-                    oldAsset = scene.AssetService.Get(lastTextureID.ToString());
-                    if (oldAsset != null)
-                    {
-                        assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
-                    }
-                    else
+                    Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
+                    if (defaultFace != null)
                     {
-                        assetData = new byte[data.Length];
-                        Array.Copy(data, assetData, data.Length);
+                        oldAsset = scene.AssetService.Get(defaultFace.TextureID.ToString());
+
+                        if (oldAsset != null)
+                            assetData = BlendTextures(data, oldAsset.Data, SetNewFrontAlpha, FrontAlpha);
                     }
                 }
-                else
+
+                if (assetData == null)
                 {
                     assetData = new byte[data.Length];
                     Array.Copy(data, assetData, data.Length);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index 285d36a..b71b5f6 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -251,13 +251,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                     // if you want tree blocks on the map comment the above line and uncomment the below line
                                     //mapdotspot = Color.PaleGreen;
 
-                                    if (part.Shape.Textures == null)
-                                        continue;
+                                    Primitive.TextureEntry textureEntry = part.Shape.Textures;
 
-                                    if (part.Shape.Textures.DefaultTexture == null)
+                                    if (textureEntry == null || textureEntry.DefaultTexture == null)
                                         continue;
 
-                                    Color4 texcolor = part.Shape.Textures.DefaultTexture.RGBA;
+                                    Color4 texcolor = textureEntry.DefaultTexture.RGBA;
 
                                     // Not sure why some of these are null, oh well.