1 files changed, 4 insertions, 4 deletions

diff --git a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
index 7aad13d2..fc3c23e3 100644
--- a/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
+++ b/src/WixToolset.Data/Tuples/WixComponentSearchTuple.cs
@@ -43,25 +43,25 @@ namespace WixToolset.Data.Tuples
 
         public string WixSearch_
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.WixSearch_];
             set => this.Set((int)WixComponentSearchTupleFields.WixSearch_, value);
         }
 
         public string Guid
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.Guid];
             set => this.Set((int)WixComponentSearchTupleFields.Guid, value);
         }
 
         public string ProductCode
         {
-            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode]?.Value;
+            get => (string)this.Fields[(int)WixComponentSearchTupleFields.ProductCode];
             set => this.Set((int)WixComponentSearchTupleFields.ProductCode, value);
         }
 
         public int Attributes
         {
-            get => (int)this.Fields[(int)WixComponentSearchTupleFields.Attributes]?.Value;
+            get => (int)this.Fields[(int)WixComponentSearchTupleFields.Attributes];
             set => this.Set((int)WixComponentSearchTupleFields.Attributes, value);
         }
     }