diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
index 32e58eb3..9d93fe44 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
@@ -165,14 +165,13 @@ open class DataListFragment : DeletableItemFragment(), RowRepresentableDelegate
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 		super.onActivityResult(requestCode, resultCode, data)
+
 		when (requestCode) {
 			RequestCode.NEW_DATA.value -> {
-				if (this.model.isSelectionInstance) {
-
+				if (this.model.isSelectionInstance && resultCode == Activity.RESULT_OK) {
 					data?.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)?.let { id ->
 						finishActivityWithSelection(id)
 					} ?: throw PAIllegalStateException("identifier not found")
-
 				}
 			}
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
index 98736bb4..71e6ffe6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
@@ -534,8 +534,12 @@ class HandHistoryAdapter(
 				delegate?.onItemClick(position, row, itemView.playerImage.tag as Int)
 			}
 			itemView.playerImage.setOnImageClickListener(listener)
+
+			val size = PlayerImageView.Size.SMALL
 			row.playerSetup?.player?.let { player ->
-				itemView.playerImage.setPlayer(player, PlayerImageView.Size.SMALL)
+				itemView.playerImage.setPlayer(player, size)
+			} ?: run {
+				itemView.playerImage.clear(size)
 			}
 
 			// Title
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index 79effa96..36440d2b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -1,6 +1,7 @@
 package net.pokeranalytics.android.ui.modules.handhistory
 
 import android.animation.ValueAnimator
+import android.app.Activity
 import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
@@ -199,11 +200,15 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 
 		when (requestCode) {
 			RequestCode.PLAYER_SELECTION.ordinal -> {
-				val playerId = data?.getStringExtra(BaseFragment.BundleKey.PRIMARY_KEY.value) ?: throw PAIllegalStateException("Primary key not set where as activity has finished")
-				getRealm().findById<Player>(playerId)?.let { player ->
-					this.model.playerSelected(player)
-				} ?: throw PAIllegalStateException("Player (id=$playerId) not found")
-				this.handHistoryAdapter.notifyDataSetChanged()
+
+				if (resultCode == Activity.RESULT_OK) {
+					val playerId = data?.getStringExtra(BaseFragment.BundleKey.PRIMARY_KEY.value) ?: throw PAIllegalStateException("Primary key not set where as activity has finished")
+					getRealm().findById<Player>(playerId)?.let { player ->
+						this.model.playerSelected(player)
+					} ?: throw PAIllegalStateException("Player (id=$playerId) not found")
+					this.handHistoryAdapter.notifyDataSetChanged()
+				}
+
 			}
 		}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
index 46b25e90..49c099e1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt
@@ -67,7 +67,7 @@ class PlayerImageView : FrameLayout {
 	 */
 	private fun init() {
 		val layoutInflater = LayoutInflater.from(context)
-		playerImageView = layoutInflater.inflate(R.layout.view_player_image, this, false) as ConstraintLayout
+		this.playerImageView = layoutInflater.inflate(R.layout.view_player_image, this, false) as ConstraintLayout
 		val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
 		addView(playerImageView, layoutParams)
 	}
@@ -145,4 +145,9 @@ class PlayerImageView : FrameLayout {
 
 	}
 
+	fun clear(size: Size = Size.NORMAL) {
+		val drawable = this.playerImageView.playerStroke.background as GradientDrawable?
+		drawable?.setStroke(size.getStrokeSize(), getColor(context, R.color.kaki))
+	}
+
 }
\ No newline at end of file