1 files changed, 11 insertions, 2 deletions

diff --git a/src/wix/wix/Program.cs b/src/wix/wix/Program.cs
index d1818df0..e4ee7ba1 100644
--- a/src/wix/wix/Program.cs
+++ b/src/wix/wix/Program.cs
@@ -54,9 +54,18 @@ namespace WixToolset.Tools
             }
             catch (WixException e)
             {
-                listener.Write(e.Error);
+                if (e.Error != null)
+                {
+                    listener.Write(e.Error);
 
-                return e.Error.Id;
+                    return e.Error.Id;
+                }
+                else
+                {
+                    listener.Write(e.Message);
+
+                    return e.HResult;
+                }
             }
             catch (Exception e)
             {