diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
index 67b6678..f80b4fd 100644
--- a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
+++ b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java
@@ -288,10 +288,13 @@ public class TournamentPlayService {
     match.getGames().clear();
     match.getGames().addAll(resultToGames(result, match));
 
-    var countingPlayer = getPlayer(tournament, match.getCounter().getId());
-    countingPlayer.setCounting(false);
-    countingPlayer.incrementCounts();
-    match.setCounter(null);
+    var counter = match.getCounter();
+    if (counter != null) { // match was already saved, this is a correction
+      var countingPlayer = getPlayer(tournament, counter.getId());
+      countingPlayer.setCounting(false);
+      countingPlayer.incrementCounts();
+      match.setCounter(null);
+    }
 
     tournamentRepository.save(tournament);
     return tournament;