2 files changed, 6 insertions, 6 deletions

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index b83aaec4..7e6ddd64 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -377,18 +377,18 @@ namespace WixToolset.Core.CommandLine
             context.SourcePath = sourcePath;
             context.Variables = preprocessorVariables;
 
-            XDocument document = null;
+            IPreprocessResult result = null;
             try
             {
                 var preprocessor = this.ServiceProvider.GetService<IPreprocessor>();
-                document = preprocessor.Preprocess(context);
+                result = preprocessor.Preprocess(context);
             }
             catch (WixException e)
             {
                 this.Messaging.Write(e.Error);
             }
 
-            return document;
+            return result?.Document;
         }
 
         private class CommandLine
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index 69e35cab..bc37ee8c 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -63,11 +63,11 @@ namespace WixToolset.Core.CommandLine
                 context.SourcePath = sourceFile.SourcePath;
                 context.Variables = this.PreprocessorVariables;
 
-                XDocument document = null;
+                IPreprocessResult result = null;
                 try
                 {
                     var preprocessor = this.ServiceProvider.GetService<IPreprocessor>();
-                    document = preprocessor.Preprocess(context);
+                    result = preprocessor.Preprocess(context);
                 }
                 catch (WixException e)
                 {
@@ -83,7 +83,7 @@ namespace WixToolset.Core.CommandLine
                 compileContext.Extensions = this.ExtensionManager.Create<ICompilerExtension>();
                 compileContext.OutputPath = sourceFile.OutputPath;
                 compileContext.Platform = this.Platform;
-                compileContext.Source = document;
+                compileContext.Source = result?.Document;
 
                 var compiler = this.ServiceProvider.GetService<ICompiler>();
                 var intermediate = compiler.Compile(compileContext);