diff --git a/app/src/main/java/com/todoroo/astrid/data/Task.kt b/app/src/main/java/com/todoroo/astrid/data/Task.kt
index ebb035e5e..60cdd1051 100644
--- a/app/src/main/java/com/todoroo/astrid/data/Task.kt
+++ b/app/src/main/java/com/todoroo/astrid/data/Task.kt
@@ -196,8 +196,8 @@ class Task : Parcelable {
     /** Checks whether task is done. Requires DUE_DATE  */
     fun hasDueDate() = dueDate > 0
 
-    fun createHideUntil(value: HideUntilControlSet.HideUntilValue) =
-            createHideUntil(value.setting, value.date)
+    fun createHideUntil(value: HideUntilControlSet.HideUntilValue?) =
+            value?.let { createHideUntil(it.setting, it.date) } ?: 0
 
     /**
      * Create hide until for this task.
diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 84e578ba9..1781ffb2e 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -90,7 +90,6 @@ class TaskEditViewModel @ViewModelInject constructor(
     var dueDate: Long? = null
         get() = field ?: task?.dueDate ?: 0
         set(value) {
-            val oldDueDate = dueDate!!
             field = when {
                 value == null -> null
                 value == 0L -> 0
@@ -255,7 +254,7 @@ class TaskEditViewModel @ViewModelInject constructor(
                 it.dueDate != dueDate ||
                 it.priority != priority ||
                 it.notes != description ||
-                it.hideUntil != it.createHideUntil(hideUntilValue!!) ||
+                it.hideUntil != it.createHideUntil(hideUntilValue) ||
                 if (it.recurrence.isNullOrBlank()) {
                     !recurrence.isNullOrBlank()
                 } else {
@@ -292,7 +291,7 @@ class TaskEditViewModel @ViewModelInject constructor(
         it.dueDate = dueDate!!
         it.priority = priority!!
         it.notes = description
-        it.hideUntil = it.createHideUntil(hideUntilValue!!)
+        it.hideUntil = it.createHideUntil(hideUntilValue)
         it.recurrence = recurrence
         it.repeatUntil = repeatUntil!!
         it.elapsedSeconds = elapsedSeconds!!