diff --git a/ChangeLog/6.0.10_dev.txt b/ChangeLog/6.0.10_dev.txt
index e69de29bb2..1c3780d2ce 100644
--- a/ChangeLog/6.0.10_dev.txt
+++ b/ChangeLog/6.0.10_dev.txt
@@ -0,0 +1 @@
+[main] Fixed certain cases of NRE happened on Domain build due to views in extracted schema
\ No newline at end of file
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Internals/CatalogCloner.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Internals/CatalogCloner.cs
index 746e7553d0..d0039245bb 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Internals/CatalogCloner.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Internals/CatalogCloner.cs
@@ -157,7 +157,9 @@ private void CloneViews(Schema newSchema, Schema sourceSchema)
         var newView = newSchema.CreateView(sourceView.Name);
         CopyDbName(newView, sourceView);
         newView.CheckOptions = sourceView.CheckOptions;
-        newView.Definition = (SqlNative) sourceView.Definition.Clone();
+        if (sourceView.Definition != null) {
+          newView.Definition = (SqlNative) sourceView.Definition.Clone();
+        }
         CloneViewColumns(newView, sourceView);
         CloneIndexes(newView, sourceView);
       }