2 files changed, 7 insertions, 0 deletions

diff --git a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
index 2964cfb2..abc53b3a 100644
--- a/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixSimpleReferenceTuple.cs
@@ -20,6 +20,7 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Tuples
 {
     using System;
+    using System.Diagnostics;
 
     public enum WixSimpleReferenceTupleFields
     {
@@ -27,6 +28,7 @@ namespace WixToolset.Data.Tuples
         PrimaryKeys,
     }
 
+    [DebuggerDisplay("{SymbolicName}")]
     public class WixSimpleReferenceTuple : IntermediateTuple
     {
         public WixSimpleReferenceTuple() : base(TupleDefinitions.WixSimpleReference, null, null)
diff --git a/src/WixToolset.Data/WixOutput.cs b/src/WixToolset.Data/WixOutput.cs
index 1810862a..a3326b0b 100644
--- a/src/WixToolset.Data/WixOutput.cs
+++ b/src/WixToolset.Data/WixOutput.cs
@@ -206,6 +206,11 @@ namespace WixToolset.Data
         {
             var entry = this.archive.GetEntry(name);
 
+            if (entry == null)
+            {
+                throw new ArgumentOutOfRangeException(nameof(name));
+            }
+
             return entry.Open();
         }