diff --git a/api/chalicelib/core/funnels.py b/api/chalicelib/core/funnels.py
index c33bed586..6e4553134 100644
--- a/api/chalicelib/core/funnels.py
+++ b/api/chalicelib/core/funnels.py
@@ -177,7 +177,8 @@ def get_top_insights(project_id, user_id, funnel_id, range_value=None, start_dat
         return {"errors": ["funnel not found"]}
     get_start_end_time(filter_d=f["filter"], range_value=range_value, start_date=start_date, end_date=end_date)
     insights, total_drop_due_to_issues = significance.get_top_insights(filter_d=f["filter"], project_id=project_id)
-    insights[-1]["dropDueToIssues"] = total_drop_due_to_issues
+    if len(insights) > 0:
+        insights[-1]["dropDueToIssues"] = total_drop_due_to_issues
     return {"data": {"stages": helper.list_to_camel_case(insights),
                      "totalDropDueToIssues": total_drop_due_to_issues}}
 
diff --git a/api/chalicelib/core/significance.py b/api/chalicelib/core/significance.py
index 2580a7584..67b00c74a 100644
--- a/api/chalicelib/core/significance.py
+++ b/api/chalicelib/core/significance.py
@@ -31,7 +31,7 @@ def get_stages_and_events(filter_d, project_id) -> List[RealDictRow]:
     :param filter_d: dict contains events&filters&...
     :return:
     """
-    stages: [dict] = filter_d["events"]
+    stages: [dict] = filter_d.get("events", [])
     filters: [dict] = filter_d.get("filters", [])
     filter_issues = filter_d.get("issueTypes")
     if filter_issues is None or len(filter_issues) == 0:
@@ -583,7 +583,7 @@ def get_top_insights(filter_d, project_id):
 @dev.timed
 def get_issues_list(filter_d, project_id, first_stage=None, last_stage=None):
     output = dict({'critical_issues_count': 0})
-    stages = filter_d["events"]
+    stages = filter_d.get("events", [])
     # The result of the multi-stage query
     rows = get_stages_and_events(filter_d=filter_d, project_id=project_id)
     # print(json.dumps(rows[0],indent=4))