From a5c5e40fa979fef6bf383db8d629d4791d0b636f Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 17 Aug 2023 15:03:55 +0200
Subject: [PATCH] bug5894: fixing NPE for incremental score corrections when
 there are no uncorrected scores yet

---
 .../sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java
index f80b4804f22..6a0543f2635 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java
@@ -477,7 +477,8 @@ public class ScoreCorrectionImpl implements SettableScoreCorrection {
                 final Supplier<Double> uncorrectedScoreProvider = ()->getUncorrectedScore(competitor, raceColumn, trackedRankProvider, scoringScheme, numberOfCompetitorsInLeaderboardFetcher, timePoint, cache);
                 final Double incrementalScoreCorrectionForCompetitorInColumn = incrementalScoreCorrection.get(raceColumn.getKey(competitor));
                 if (incrementalScoreCorrectionForCompetitorInColumn != null) {
-                    result = uncorrectedScoreProvider.get() + incrementalScoreCorrectionForCompetitorInColumn;
+                    final Double uncorrectedScore = uncorrectedScoreProvider.get();
+                    result = uncorrectedScore == null ? null : (uncorrectedScore + incrementalScoreCorrectionForCompetitorInColumn);
                 } else {
                     result = scoringScheme.getPenaltyScore(raceColumn, competitor, maxPointsReason.getMaxPointsReason(),
                             getNumberOfCompetitorsInRace(raceColumn, competitor, numberOfCompetitorsInLeaderboardFetcher),