diff --git a/src/main/kotlin/dartzee/reporting/ReportingUtil.kt b/src/main/kotlin/dartzee/reporting/ReportingUtil.kt
index bd81cf19..40c602f0 100644
--- a/src/main/kotlin/dartzee/reporting/ReportingUtil.kt
+++ b/src/main/kotlin/dartzee/reporting/ReportingUtil.kt
@@ -6,9 +6,8 @@ import java.sql.ResultSet
 import java.sql.Timestamp
 import javax.swing.JCheckBox
 
-fun <T> grabIfSelected(checkbox: JCheckBox, getter: () -> T): T? {
-    return if (checkbox.isSelected) getter() else null
-}
+fun <T> grabIfSelected(checkbox: JCheckBox, getter: () -> T) =
+    if (checkbox.isSelected) getter() else null
 
 fun runReport(rp: ReportParameters?): List<ReportResultWrapper> {
     rp ?: return emptyList()
diff --git a/src/main/kotlin/dartzee/screen/reporting/PlayerParametersPanel.kt b/src/main/kotlin/dartzee/screen/reporting/PlayerParametersPanel.kt
index 796a5e42..2ee8ccfc 100644
--- a/src/main/kotlin/dartzee/screen/reporting/PlayerParametersPanel.kt
+++ b/src/main/kotlin/dartzee/screen/reporting/PlayerParametersPanel.kt
@@ -58,9 +58,8 @@ class PlayerParametersPanel : JPanel(), ActionListener {
     fun generateParameters(): IncludedPlayerParameters {
         val finalScore = grabIfSelected(chckbxFinalScore) { spinner.value as Int }
         val finalScoreComparator =
-            grabIfSelected(chckbxFinalScore) { comboBox.selectedItem as String } ?: ""
-        val finishingPosition =
-            grabIfSelected(chckbxPosition) { getFinishingPositions() } ?: emptyList()
+            grabIfSelected(chckbxFinalScore) { comboBox.selectedItem as String }.orEmpty()
+        val finishingPosition = grabIfSelected(chckbxPosition) { getFinishingPositions() }.orEmpty()
 
         return IncludedPlayerParameters(finishingPosition, finalScoreComparator, finalScore)
     }
diff --git a/src/main/kotlin/dartzee/screen/reporting/ReportingGameTab.kt b/src/main/kotlin/dartzee/screen/reporting/ReportingGameTab.kt
index 3cc9be44..6c3b0239 100644
--- a/src/main/kotlin/dartzee/screen/reporting/ReportingGameTab.kt
+++ b/src/main/kotlin/dartzee/screen/reporting/ReportingGameTab.kt
@@ -116,7 +116,7 @@ class ReportingGameTab : JPanel(), ActionListener {
 
     fun generateReportParameters(): ReportParametersGame {
         val gameType = grabIfSelected(checkBoxGameType) { comboBox.getGameType() }
-        val gameParams = grabIfSelected(cbType) { panelGameParams.getGameParams() } ?: ""
+        val gameParams = grabIfSelected(cbType) { panelGameParams.getGameParams() }.orEmpty()
         val dtStartFrom = grabIfSelected(cbStartDate) { dateFilterPanelStart.getSqlDtFrom() }
         val dtStartTo = grabIfSelected(cbStartDate) { dateFilterPanelStart.getSqlDtTo() }
         val unfinishedOnly = grabIfSelected(cbFinishDate) { rdbtnUnfinished.isSelected } ?: false