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 c1902b20..5eea0a05 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
@@ -75,7 +75,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 			session.result = result
 
 			if (bankroll != null) {
-				session.bankroll = bankroll
+				session.bankroll = realm.copyFromRealm(bankroll)
 			} else {
 				realm.where<Bankroll>().findFirst()?.let { br ->
 					session.bankroll = realm.copyFromRealm(br)
@@ -87,7 +87,7 @@ open class Session : RealmObject(), Savable, RowUpdatable, RowRepresentable, Tim
 
 			realm.where(Game::class.java)
 				.equalTo("shortName", "HE").findFirst()?.let {
-				session.game = it
+				session.game = realm.copyFromRealm(it)
 			}
 
 			return session
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt
index 7ebfac34..85e38f56 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/BaseActivity.kt
@@ -129,7 +129,6 @@ abstract class BaseActivity : AppCompatActivity() {
 		fragmentTransaction.commit()
 	}
 
-
 	/**
 	 * Return the realm instance
 	 */
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
index 70dd2c14..8990d8c8 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
@@ -25,6 +25,7 @@ import net.pokeranalytics.android.ui.view.rows.SessionPropertiesRow
 import net.pokeranalytics.android.ui.view.rows.TransactionPropertiesRow
 import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModel
 import net.pokeranalytics.android.ui.viewmodel.BottomSheetViewModelFactory
+import timber.log.Timber
 import java.util.*
 
 class BottomSheetConfig(var row: RowRepresentable,
@@ -169,10 +170,18 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 			val primaryKey = data.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)
 			val pokerAnalyticsActivity = activity as BaseActivity
 			val liveDataType = LiveData.values()[dataType]
-			this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
-			this.onRowValueChanged()
+
+			val realm = pokerAnalyticsActivity.getRealm()
+			liveDataType.getData(realm, primaryKey)?.let {
+				this.model.addedData = realm.copyFromRealm(it)
+				this.onRowValueChanged()
+				dismiss()
+			} ?: run {
+				Timber.w("Data not found with primary key = $primaryKey")
+			}
+
+//			this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
 //			this.delegate.onRowValueChanged(proxyItem, this.row)
-			dismiss()
 		}
 	}