diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
index 602762c9..75285c41 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/SessionActivity.kt
@@ -60,7 +60,12 @@ class SessionActivity: PokerAnalyticsActivity() {
 	 * Init UI
 	 */
 	private fun initUI() {
-		val sessionId = intent.getStringExtra(IntentKey.SESSION_ID.keyName)
+
+		var sessionId: String? = null
+		if (intent.hasExtra(IntentKey.SESSION_ID.keyName)) {
+			sessionId = intent.getStringExtra(IntentKey.SESSION_ID.keyName)
+		}
+
 		val isTournament = intent.getBooleanExtra(IntentKey.IS_TOURNAMENT.keyName, false)
 		val duplicate = intent.getBooleanExtra(IntentKey.DUPLICATE.keyName, false)
 		val fragment = sessionFragment as SessionFragment