diff --git a/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt b/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
index ba21ebea..dd25bd23 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt
@@ -14,7 +14,7 @@ enum class SessionState {
 	PAUSED,
 	FINISHED;
 
-	var hasStarted: Boolean = false
+	val hasStarted: Boolean
 		get() {
 			return when (this) {
 				STARTED, PAUSED, FINISHED -> true
@@ -50,7 +50,7 @@ fun Session.getState(): SessionState {
  */
 fun Session.getFormattedGameType(context: Context): String {
 
-	var parameters = mutableListOf<String>()
+	val parameters = mutableListOf<String>()
 	if (isTournament()) {
 
 		tournamentEntryFee?.let {
@@ -113,7 +113,7 @@ fun MutableList<TimeInterval>.update(timeInterval: TimeInterval): MutableList<Ti
 
 	}
 
-	if (overlapped.size == 0) { // add
+	if (overlapped.isEmpty()) { // add
 		this.add(timeInterval)
 	} else { // update
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index ca19d962..8665396d 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -512,7 +512,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	 */
 	fun startOrContinue() {
 		realm.executeTransaction {
-			when (getState()) {
+			when (val state = getState()) {
 				SessionState.PENDING, SessionState.PLANNED -> {
 					this.startDate = Date()
 					this.defineDefaultTournamentBuyinIfNecessary()
@@ -527,7 +527,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 					this.pauseDate = null
 				}
 				else -> {
-					throw PAIllegalStateException("unmanaged session state")
+					throw PAIllegalStateException("unmanaged session state: $state")
 				}
 			}
 		}
@@ -544,11 +544,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	 */
 	fun pause() {
 		realm.executeTransaction {
-			when (getState()) {
+			when (val state = getState()) {
 				SessionState.STARTED -> {
 					this.pauseDate = Date()
 				}
-				else -> throw PAIllegalStateException("Pausing a session in an unmanaged state")
+				else -> throw PAIllegalStateException("Pausing a session in an unmanaged state: $state")
 			}
 		}
 	}
@@ -558,11 +558,11 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 	 */
 	fun stop() {
 		realm.executeTransaction {
-			when (getState()) {
+			when (val state = getState()) {
 				SessionState.STARTED, SessionState.PAUSED -> {
 					this.end()
 				}
-				else -> throw Exception("Stopping session in unmanaged state")
+				else -> throw Exception("Stopping session in unmanaged state: $state")
 			}
 		}
 	}