Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingCalculationOutputEntityReadExtensions.cs
===================================================================
diff -u -r450de34f5b9bea646121b6e101c849f9f78dfc51 -r02937f67556a7b1d52477b196c62ed50df1cae6d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingCalculationOutputEntityReadExtensions.cs	(.../PipingCalculationOutputEntityReadExtensions.cs)	(revision 450de34f5b9bea646121b6e101c849f9f78dfc51)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingCalculationOutputEntityReadExtensions.cs	(.../PipingCalculationOutputEntityReadExtensions.cs)	(revision 02937f67556a7b1d52477b196c62ed50df1cae6d)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-
 using Application.Ringtoets.Storage.DbContext;
 
 using Ringtoets.Piping.Data;
@@ -42,21 +40,12 @@
         /// <returns>A new <see cref="PipingOutput"/>.</returns>
         internal static PipingOutput Read(this PipingCalculationOutputEntity entity)
         {
-            return new PipingOutput(GetNanDouble(entity.UpliftZValue), GetNanDouble(entity.UpliftFactorOfSafety),
-                                    GetNanDouble(entity.HeaveZValue), GetNanDouble(entity.HeaveFactorOfSafety),
-                                    GetNanDouble(entity.SellmeijerZValue), GetNanDouble(entity.SellmeijerFactorOfSafety))
+            return new PipingOutput(entity.UpliftZValue.ToNanableDouble(), entity.UpliftFactorOfSafety.ToNanableDouble(),
+                                    entity.HeaveZValue.ToNanableDouble(), entity.HeaveFactorOfSafety.ToNanableDouble(),
+                                    entity.SellmeijerZValue.ToNanableDouble(), entity.SellmeijerFactorOfSafety.ToNanableDouble())
             {
                 StorageId = entity.PipingCalculationOutputEntityId
             };
         }
-
-        private static double GetNanDouble(decimal? parameterValue)
-        {
-            if (parameterValue == null)
-            {
-                return double.NaN;
-            }
-            return Convert.ToDouble(parameterValue);
-        }
     }
 }
\ No newline at end of file