1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index be2d8da..34dc552 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -197,6 +197,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                 if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
                 {
                     OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
                     materialsStore.TryGetValue("Materials", out OSMaterials);
                 }