Fixes #11169

Should also be ported to v10.
2022-03-23 17:05:12 +01:00
parent cde05c1197
commit 538fb173c2
1 changed files with 6 additions and 2 deletions
--- a/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
+++ b/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
@@ -799,8 +799,12 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder
            {
                if (disposing)
                {
-                    _watcher.EnableRaisingEvents = false;
-                    _watcher.Dispose();
+                    if (_watcher != null) 
+                    {
+                        _watcher.EnableRaisingEvents = false;
+                        _watcher.Dispose();
+                    }
+                    
                    _locker.Dispose();
                }