From 538fb173c2121685fb9ac1f46547a97f80de473d Mon Sep 17 00:00:00 2001
From: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:05:12 +0100
Subject: [PATCH] Fixes #11169

Should also be ported to v10.
---
 .../ModelsBuilder/InMemoryModelFactory.cs                 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs b/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
index 44e08f0af1..419352c56c 100644
--- 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();
                 }