diff --git a/src-dbg/flow_storm/debugger/ui/main.clj b/src-dbg/flow_storm/debugger/ui/main.clj
index bc8ba5c4..3ad2efd5 100644
--- a/src-dbg/flow_storm/debugger/ui/main.clj
+++ b/src-dbg/flow_storm/debugger/ui/main.clj
@@ -202,7 +202,7 @@
                                (.setAlignment Pos/CENTER_LEFT))
         format-exception-item (fn [{:keys [idx fn-ns fn-name ex-type]}]
                                 (format "%d - %s/%s %s" idx fn-ns fn-name ex-type))
-        exceptions-combo (combo-box {:on-change-fn (fn [_ {:keys [flow-id thread-id idx ex-message] :as to-item}]
+        exceptions-combo (combo-box {:on-change-fn (fn [_ {:keys [flow-id thread-id idx] :as to-item}]
                                                      (when to-item
                                                        (flows-screen/goto-location {:flow-id flow-id
                                                                                     :thread-id thread-id
diff --git a/src-inst/flow_storm/runtime/indexes/thread_registry.cljc b/src-inst/flow_storm/runtime/indexes/thread_registry.cljc
index 81816fdd..66ed8c38 100644
--- a/src-inst/flow_storm/runtime/indexes/thread_registry.cljc
+++ b/src-inst/flow_storm/runtime/indexes/thread_registry.cljc
@@ -2,7 +2,7 @@
   (:require [flow-storm.runtime.indexes.protocols :as index-protos]
             [flow-storm.runtime.indexes.utils :refer [int-map make-mutable-list ml-add ml-clear]]
             [flow-storm.runtime.types.fn-call-trace :as fn-call-trace :refer [fn-call-trace?]]
-            [flow-storm.runtime.types.fn-return-trace :as fn-return-trace :refer [fn-end-trace?]]
+            [flow-storm.runtime.types.fn-return-trace :as fn-return-trace :refer [fn-end-trace? fn-return-trace?]]
             [flow-storm.runtime.types.expr-trace :as expr-trace :refer [expr-trace?]]
             [clojure.string :as str]
             [hansel.utils :as hansel-utils])
@@ -153,7 +153,9 @@
               (fn-end-trace? entry)
               (recur r
                      (update threads-stacks tid pop)
-                     (conj! timeline-ret {:type                :fn-return
+                     (conj! timeline-ret {:type                (if (fn-return-trace? entry)
+                                                                 :fn-return
+                                                                 :fn-unwind)
                                           :flow-id             fid
                                           :thread-id           tid
                                           :thread-timeline-idx tidx}))