diff --git a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
index 2f923daf5f..e2e40abe45 100644
--- a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
@@ -291,9 +291,10 @@ class GameOptionsTable(
 
         var desiredCiv = ""
         if (gameParameters.mods.contains(mod)) {
-            val modNations = RulesetCache[mod]?.nations
-            if (modNations != null && modNations.size > 0)
-                desiredCiv = modNations.values.filter { it.isMajorCiv() }.random().name
+            val modNations = RulesetCache[mod]?.nations?.values?.filter { it.isMajorCiv() }
+
+            if (modNations != null && modNations.any())
+                desiredCiv = modNations.random().name
 
             val music = UncivGame.Current.musicController
             if (!music.chooseTrack(mod, MusicMood.Theme, MusicTrackChooserFlags.setSelectNation) && desiredCiv.isNotEmpty())