diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index b57b6c23b..2a910e5f6 100755
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -326,7 +326,10 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar
     }
 
     public void onDueDateChanged(long dueDate) {
-        getRepeatControlSet().onDueDateChanged(dueDate);
+        RepeatControlSet repeatControlSet = getRepeatControlSet();
+        if (repeatControlSet != null) {
+            repeatControlSet.onDueDateChanged(dueDate);
+        }
     }
 
     public void addComment(String message, String actionCode, String picture) {