diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
index d2cf4a4f2..6bfd96167 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.kt
@@ -78,7 +78,7 @@ open class TaskAdapter {
 
     fun isHeader(position: Int): Boolean = dataSource.isHeader(position)
 
-    fun getTask(position: Int): TaskContainer = dataSource.getItem(position)
+    fun getTask(position: Int): TaskContainer = dataSource.getItem(position)!!
 
     fun getItemUuid(position: Int): String = getTask(position).uuid
 
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterDataSource.kt b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterDataSource.kt
index dd1c6f3ed..2c0c5c634 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterDataSource.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/TaskAdapterDataSource.kt
@@ -3,7 +3,7 @@ package com.todoroo.astrid.adapter
 import org.tasks.data.TaskContainer
 
 interface TaskAdapterDataSource {
-    fun getItem(position: Int): TaskContainer
+    fun getItem(position: Int): TaskContainer?
 
     fun getTaskCount(): Int
 
diff --git a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
index ba7157a2c..4176ca4c6 100644
--- a/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/DragAndDropRecyclerAdapter.kt
@@ -65,7 +65,7 @@ class DragAndDropRecyclerAdapter(
 
     override fun isHeader(position: Int): Boolean = list.isHeader(position)
 
-    override fun getItem(position: Int): TaskContainer = list.getItem(position)
+    override fun getItem(position: Int) = list.getItem(position)
 
     override fun submitList(list: List<TaskContainer>) {
         disposables.add(
diff --git a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt
index 9667ba14d..cfad71da7 100644
--- a/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt
+++ b/app/src/main/java/org/tasks/tasklist/PagedListRecyclerAdapter.kt
@@ -22,7 +22,7 @@ class PagedListRecyclerAdapter(
     private val differ: AsyncPagedListDiffer<TaskContainer> =
             AsyncPagedListDiffer(this, AsyncDifferConfig.Builder(ItemCallback()).build())
 
-    override fun getItem(position: Int) = differ.getItem(position)!!
+    override fun getItem(position: Int) = differ.getItem(position)
 
     override fun submitList(list: List<TaskContainer>) = differ.submitList(list as PagedList<TaskContainer>)