Index: Ringtoets/Common/src/Ringtoets.Common.Util/StructuresHelper.cs =================================================================== diff -u -r9a637f9e1783f766a92c32ae45ebce60710e4c05 -r5fc1f380dc9907795f36902c94502cebcd8a32a4 --- Ringtoets/Common/src/Ringtoets.Common.Util/StructuresHelper.cs (.../StructuresHelper.cs) (revision 9a637f9e1783f766a92c32ae45ebce60710e4c05) +++ Ringtoets/Common/src/Ringtoets.Common.Util/StructuresHelper.cs (.../StructuresHelper.cs) (revision 5fc1f380dc9907795f36902c94502cebcd8a32a4) @@ -70,6 +70,7 @@ { throw new ArgumentNullException(nameof(calculations)); } + return calculations.Select(AsCalculationWithLocation).Where(c => c != null); } @@ -80,10 +81,12 @@ { throw new ArgumentNullException(nameof(calculation)); } + if (calculation.InputParameters.Structure == null) { return null; } + return new CalculationWithLocation(calculation, calculation.InputParameters.Structure.Location); } }