Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -78,8 +78,14 @@ /// public void Cancel() { - overtoppingCalculator?.Cancel(); - dikeHeightCalculator?.Cancel(); + if (overtoppingCalculator != null) + { + overtoppingCalculator.Cancel(); + } + if (dikeHeightCalculator != null) + { + dikeHeightCalculator.Cancel(); + } canceled = true; } @@ -198,7 +204,10 @@ private void NotifyProgress(string stepName, int currentStepNumber, int totalStepNumber) { - OnProgress?.Invoke(stepName, currentStepNumber, totalStepNumber); + if (OnProgress != null) + { + OnProgress.Invoke(stepName, currentStepNumber, totalStepNumber); + } } private void CalculateOvertopping(OvertoppingCalculationInput overtoppingCalculationInput, string calculationName)