2 files changed, 12 insertions, 5 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index ae7f7624..d6c96b28 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -5358,6 +5358,7 @@ namespace WixToolset.Core
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             var id = CompilerConstants.IntegerNotSet;
+            string message = null;
 
             foreach (var attrib in node.Attributes())
             {
@@ -5368,6 +5369,9 @@ namespace WixToolset.Core
                     case "Id":
                         id = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue);
                         break;
+                    case "Message":
+                        message = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty);
+                        break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
                         break;
@@ -5385,13 +5389,18 @@ namespace WixToolset.Core
                 id = CompilerConstants.IllegalInteger;
             }
 
+            if (String.IsNullOrEmpty(message))
+            {
+                message = Common.GetInnerText(node);
+            }
+
             this.Core.ParseForExtensionElements(node);
 
             if (!this.Core.EncounteredError)
             {
                 this.Core.AddTuple(new ErrorTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, id))
                 {
-                    Message = Common.GetInnerText(node)
+                    Message = message
                 });
             }
         }
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs
index c9c65fc7..88a4ac81 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/ErrorsInUI/PackageComponents.wxs
@@ -2,10 +2,8 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <UI>
-            <Error Id="1234">
-                Category 55 Emergency Doomsday Crisis
-            </Error>
-            <Error Id="5678"><![CDATA[ ]]></Error>
+            <Error Id="1234" Message="Category 55 Emergency Doomsday Crisis" />
+            <Error Id="5678" Message=" " />
         </UI>
         <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
             <Component>