diff --git a/src/main/java/seedu/todo/controllers/ListController.java b/src/main/java/seedu/todo/controllers/ListController.java
index 593f3c57dd16..1634f811936d 100644
--- a/src/main/java/seedu/todo/controllers/ListController.java
+++ b/src/main/java/seedu/todo/controllers/ListController.java
@@ -80,25 +80,17 @@ public void process(String input) throws ParseException {
         
         boolean isTask = tasksOrEventsBools[0];
         boolean isEvent = tasksOrEventsBools[1];
-        
-        // Filter tasks.
-        if (isTask) {
-            try {
+
+        try {
+            if (isTask) {
                 filteredTasks = CalendarItemFilter.filterTasks(parsedResult);
-            } catch (InvalidNaturalDateException e) {
-                System.out.println("Disambiguate: Invalid date format");
-                return;
             }
-        }
-        
-        // Filter events.
-        if (isEvent) {
-            try {
+            if (isEvent) {
                 filteredEvents = CalendarItemFilter.filterEvents(parsedResult);
-            } catch (InvalidNaturalDateException e) {
-                System.out.println("Disambiguate: Invalid date format");
-                return;
             }
+        } catch (InvalidNaturalDateException e) {
+            System.out.println("Disambiguate: Invalid date format");
+            return;
         }
         
         // Render the new view with filtered tasks.