diff --git a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
index e4ebe6322..51c623b5a 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
@@ -302,7 +302,12 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
     private boolean saveTask(Task task) {
         task.text = taskText.getText().toString();
 
-        task.setChecklist(checklistAdapter.getCheckListItems());
+        if (checklistAdapter != null) {
+            if (checklistAdapter.getCheckListItems() != null) {
+                task.setChecklist(checklistAdapter.getCheckListItems());
+            }
+        }
+
 
         if (task.text.isEmpty())
             return false;