Merge with 4.11.6

2013-03-26 09:53:59 -01:00
parent 9dde86d591 ff961abaab
commit 8edfc0ffdd
1 changed files with 2 additions and 1 deletions
--- a/src/umbraco.cms/businesslogic/ContentType.cs
+++ b/src/umbraco.cms/businesslogic/ContentType.cs
@@ -139,7 +139,8 @@ namespace umbraco.cms.businesslogic
                }
                foreach (Tuple<string, string> key in toDelete)
                {
-                    _propertyTypeCache.Remove(key);
+                    if(_propertyTypeCache != null)
+                        _propertyTypeCache.Remove(key);
                }
            }
            //don't put lock around this as it is ConcurrentDictionary.