From 0228135e212a71cb5d5e13be6a8b1b4181481ce3 Mon Sep 17 00:00:00 2001
From: louietyj <louietyj@gmail.com>
Date: Mon, 7 Nov 2016 01:50:48 +0800
Subject: [PATCH] More guards against naturalFrom == null

---
 src/main/java/seedu/todo/controllers/UpdateController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/seedu/todo/controllers/UpdateController.java b/src/main/java/seedu/todo/controllers/UpdateController.java
index e66a4f6e8dbf..43b40c6bf021 100644
--- a/src/main/java/seedu/todo/controllers/UpdateController.java
+++ b/src/main/java/seedu/todo/controllers/UpdateController.java
@@ -186,7 +186,7 @@ private void updateCalendarItem(TodoListDB db, CalendarItem record, boolean isTa
             Task task = (Task) record;
             if (dateFrom != null) {
                 task.setDueDate(dateFrom);
-            } else if (naturalFrom.trim().equals(STRING_NULL)) {
+            } else if (naturalFrom != null && naturalFrom.trim().equals(STRING_NULL)) {
                 task.setDueDate(null);
             }
         } else {