Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs
===================================================================
diff -u -rf18ccfb35619abc909207957f0d62cca17013e5d -r52753aa86e235c7bff6636f4500b4605a21d75a2
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision f18ccfb35619abc909207957f0d62cca17013e5d)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/UseBreakWaterProperties.cs	(.../UseBreakWaterProperties.cs)	(revision 52753aa86e235c7bff6636f4500b4605a21d75a2)
@@ -92,11 +92,7 @@
         {
             get
             {
-                if (data != null && data.BreakWater != null)
-                {
-                    return data.BreakWater.Type;
-                }
-                return null;
+                return data?.BreakWater?.Type;
             }
             set
             {
@@ -117,11 +113,7 @@
         {
             get
             {
-                if (data != null && data.BreakWater != null)
-                {
-                    return data.BreakWater.Height;
-                }
-                return RoundedDouble.NaN;
+                return data?.BreakWater?.Height ?? RoundedDouble.NaN;
             }
             set
             {
@@ -145,10 +137,7 @@
 
         private void NotifyPropertyChanged()
         {
-            if (changeHandler != null)
-            {
-                changeHandler.PropertyChanged();
-            }
+            changeHandler?.PropertyChanged();
             data.NotifyObservers();
         }
     }