diff --git a/Source/XStaticCore/XStatic.Core/Generator/GeneratorBase.cs b/Source/XStaticCore/XStatic.Core/Generator/GeneratorBase.cs
index 7f8475b..e87354a 100644
--- a/Source/XStaticCore/XStatic.Core/Generator/GeneratorBase.cs
+++ b/Source/XStaticCore/XStatic.Core/Generator/GeneratorBase.cs
@@ -161,6 +161,7 @@ protected string RunTransformers(string fileData, IEnumerable<ITransformer> tran
         {
             if (transformers == null) return fileData;
 
+            if (fileData==null) return fileData;
             var context = GetContext();
             foreach (var transformer in transformers)
             {
diff --git a/Source/XStaticCore/XStatic.Core/Generator/StaticHtmlSiteGenerator.cs b/Source/XStaticCore/XStatic.Core/Generator/StaticHtmlSiteGenerator.cs
index dac9183..5a6532c 100644
--- a/Source/XStaticCore/XStatic.Core/Generator/StaticHtmlSiteGenerator.cs
+++ b/Source/XStaticCore/XStatic.Core/Generator/StaticHtmlSiteGenerator.cs
@@ -36,7 +36,10 @@ public override async Task<GenerateItemResult> GeneratePage(int id, int staticSi
             {
                 return null;
             }
-
+            if (node.TemplateId== null)
+            {
+                return null;
+            }
             try
             {
                 var url = node.Url(_publishedUrlProvider, mode: UrlMode.Relative);