diff --git a/src/TextureFetcher.cs b/src/TextureFetcher.cs
index 813bc40..cf4747f 100644
--- a/src/TextureFetcher.cs
+++ b/src/TextureFetcher.cs
@@ -116,8 +116,16 @@ namespace OpenSim.Modules.TextureFetcher
                 Primitive.TextureEntry textures = part.Shape.Textures;
                 int allSides = part.GetNumberOfSides();
                 for (uint i = 0; i < allSides; i++)
+                {
                     if (textures.FaceTextures[i] != null)
-                        allTextures.Add(textures.FaceTextures[i].TextureID);
+                    {
+                        if (textures.FaceTextures[i].TextureID != null)
+                            allTextures.Add(textures.FaceTextures[i].TextureID);
+
+                        if (textures.FaceTextures[i].MaterialID != null)
+                            allTextures.Add(textures.FaceTextures[i].MaterialID);
+                    }
+                }
 
 
                 //Convert texture uuid list to inventar items.