diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index f4ecb721..7f3cb6fa 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -78,8 +78,13 @@ class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataSource
 		dataListAdapter = RowRepresentableAdapter(this, this)
 
 		val swipeToDelete = SwipeToDeleteCallback(dataListAdapter) { position ->
-			val itemId = (this.items[position] as Identifiable).id
-			deleteItem(dataListAdapter, items, itemId)
+			val item = this.items[position]
+			if (item != null) {
+				val itemId = item.id
+				deleteItem(dataListAdapter, items, itemId)
+			} else {
+				throw IllegalStateException("Item with position $position not found")
+			}
 		}
 
 		val itemTouchHelper = ItemTouchHelper(swipeToDelete)