diff --git a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt
index 37ee9326..3a156a62 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/utils/FavoriteSessionFinder.kt
@@ -68,7 +68,7 @@ class FavoriteSessionFinder {
 
     companion object {
 
-        private val FAVORITE_SIGNIFICANT_SESSIONS = 15L
+        private const val FAVORITE_SIGNIFICANT_SESSIONS = 15L
 
         /**
          * Copies the favorite session parameters on the [newSession]
@@ -94,7 +94,6 @@ class FavoriteSessionFinder {
                     }
                 }
             }
-
         }
 
         /**
@@ -123,7 +122,7 @@ class FavoriteSessionFinder {
             }
 
             val sortedCounters = counters.values.sortedBy { it.counter }
-            return sortedCounters.first().session
+            return sortedCounters.firstOrNull()?.session
         }
 
     }