Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs
===================================================================
diff -u -rabf027a3519fdb584ae797edd62f2baaab6d6968 -rf2295cd5ced4b2e2e116dede857b6ec78cde0ee9
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision abf027a3519fdb584ae797edd62f2baaab6d6968)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision f2295cd5ced4b2e2e116dede857b6ec78cde0ee9)
@@ -186,14 +186,8 @@
             }
             set
             {
-                if (double.IsNaN(value))
-                {
-                    structureNormalOrientation = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces);
-                    return;
-                }
-
                 RoundedDouble newOrientationValue = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces);
-                if (newOrientationValue < 0 || newOrientationValue > 360)
+                if (!double.IsNaN(newOrientationValue) && (newOrientationValue < 0 || newOrientationValue > 360))
                 {
                     throw new ArgumentOutOfRangeException("value", Resources.Orientation_Value_needs_to_be_between_0_and_360);
                 }
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -r63b0f1800d86c219732bf730d0137e7711b00b47 -rf2295cd5ced4b2e2e116dede857b6ec78cde0ee9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision 63b0f1800d86c219732bf730d0137e7711b00b47)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision f2295cd5ced4b2e2e116dede857b6ec78cde0ee9)
@@ -109,14 +109,8 @@
             }
             set
             {
-                if (double.IsNaN(value))
-                {
-                    orientation = value.ToPrecision(orientation.NumberOfDecimalPlaces);
-                    return;
-                }
-
                 RoundedDouble newOrientation = value.ToPrecision(orientation.NumberOfDecimalPlaces);
-                if (newOrientation < 0 || newOrientation > 360)
+                if (!double.IsNaN(newOrientation) && (newOrientation < 0 || newOrientation > 360))
                 {
                     throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.Orientation_Value_needs_to_be_between_0_and_360);
                 }