3 files changed, 2 insertions, 1 deletions

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index e3609b30..788e87b8 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -4506,7 +4506,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
             {
                 var xError = new XElement(Names.ErrorElement,
                     new XAttribute("Id", row.FieldAsString(0)),
-                    new XAttribute("Message", row.FieldAsString(1)));
+                    row.IsColumnNull(1) ? null : new XAttribute("Message", row.FieldAsString(1)));
 
                 this.UIElement.Add(xError);
             }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
index 38aa2e7a..7c90971a 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ExpectedUI.wxs
@@ -542,6 +542,7 @@
     </UI>
     <CustomAction Id="WixUIValidatePath" Return="ignore" BinaryRef="WixUIWixca" DllEntry="ValidatePath" />
     <CustomAction Id="WixUIPrintEula" Return="ignore" BinaryRef="WixUIWixca" DllEntry="PrintEula" />
+    <Error Id="123" />
     <Feature Id="ProductFeature" Title="ui" Level="1">
       <ComponentRef Id="ProductComponent" />
     </Feature>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi
index 230cdb5d..4dea2b88 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Decompile/ui.msi