2 files changed, 9 insertions, 0 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 1f1d459..fcb0f54 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -309,6 +309,9 @@ cpus_clicked (gpointer data)
         gboolean all_cpus;
         guint64 *cpu_mask;
 
+        if (!info->handle)
+                return;
+
         store = TRACE_VIEW_STORE(gtk_tree_view_get_model(trace_tree));
 
         all_cpus = trace_view_store_get_all_cpus(store);
diff --git a/trace-filter.c b/trace-filter.c
index faf1e89..15d59c0 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -717,6 +717,9 @@ void trace_adv_filter_dialog(struct tracecmd_input *handle,
         GtkWidget *view;
         GtkWidget *event_box;
 
+        if (!handle)
+                return;
+
         helper = g_malloc(sizeof(*helper));
         g_assert(helper);
 
@@ -1762,6 +1765,9 @@ void trace_filter_event_filter_dialog(struct tracecmd_input *handle,
         gchar **systems;
         gint *event_ids;
 
+        if (!handle)
+                return;
+
         trace_filter_convert_filter_to_names(filter, &systems, &event_ids);
 
         filter_event_dialog(handle, filter, all_events, systems,