From 1d0cc270e3a5866d50970b1442c86279adc65da0 Mon Sep 17 00:00:00 2001
From: Michel ten Voorde <michel@tenvoorde.org>
Date: Sat, 25 Oct 2025 15:22:00 +0200
Subject: [PATCH] Fix when no substitutions

---
 .../nl/connectedit/swiss/service/RegistrationService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/nl/connectedit/swiss/service/RegistrationService.java b/src/main/java/nl/connectedit/swiss/service/RegistrationService.java
index 761eeb7..d5df5d6 100644
--- a/src/main/java/nl/connectedit/swiss/service/RegistrationService.java
+++ b/src/main/java/nl/connectedit/swiss/service/RegistrationService.java
@@ -53,7 +53,9 @@ public class RegistrationService {
   private void removeEventFromTournamentPlayer(Tournament tournament, Player player, Event event) {
     var tournamentPlayer = findOrAddTournamentPlayer(tournament, player);
     tournamentPlayer.getEvents().removeIf(eventType -> eventType.equals(event.getType().name()));
-    tournamentPlayer.getSubstitutions().removeIf(substitution -> substitution.getEvent().equals(event));
+    if (tournamentPlayer.getSubstitutions() != null) {
+      tournamentPlayer.getSubstitutions().removeIf(substitution -> substitution.getEvent().equals(event));
+    }
   }
 
   private void addEventToTournamentPlayer(Tournament tournament, Player player, Event event) {