diff --git a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
index 1fa4e224703..9ca4e506219 100644
--- a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
+++ b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
@@ -54,11 +54,14 @@ public class TournamentSwiss extends AbstractTournament {
         List<TournamentPlayer> leftoverPlayers = new ArrayList<>();
 
         List<TournamentPlayer> groupPlayers = Lists.newArrayList(allPlayers);
-        groupPlayers.remove(byePlayer);
 
-        TournamentPairing byePair = new TournamentPairing(activeRound, Lists.<TournamentPlayer>newArrayList(byePlayer));
-        byePair.setBye(true);
-        activePairings.add(byePair);
+        if (byePlayer != null) {
+            groupPlayers.remove(byePlayer);
+
+            TournamentPairing byePair = new TournamentPairing(activeRound, Lists.<TournamentPlayer>newArrayList(byePlayer));
+            byePair.setBye(true);
+            activePairings.add(byePair);
+        }
 
         if (groupPlayers.isEmpty()) {
             return;