diff --git a/src/haps/mod.rs b/src/haps/mod.rs
index 5732f6d8..9986201e 100644
--- a/src/haps/mod.rs
+++ b/src/haps/mod.rs
@@ -427,9 +427,9 @@ impl Tsffs {
 
             let (exit_kind, iteration_count) = match kind {
                 SolutionKind::Timeout => (ExitKind::Timeout, IterationCount::Timeout),
-                SolutionKind::Exception | SolutionKind::Breakpoint | SolutionKind::Manual => {
-                    (ExitKind::Crash, IterationCount::Solution)
-                }
+                SolutionKind::Exception { .. }
+                | SolutionKind::Breakpoint { .. }
+                | SolutionKind::Manual => (ExitKind::Crash, IterationCount::Solution),
             };
 
             // Solution/timeout path: classify exit kind and increment corresponding counters.
@@ -547,7 +547,7 @@ impl Tsffs {
     pub fn on_exception(&mut self, _obj: *mut ConfObject, exception: i64) -> Result<()> {
         if self.all_exceptions_are_solutions || self.exceptions.contains(&exception) {
             self.stop_simulation(StopReason::Solution {
-                kind: SolutionKind::Exception,
+                kind: SolutionKind::Exception { number: exception },
             })?;
         }
         Ok(())
@@ -571,7 +571,7 @@ impl Tsffs {
             );
 
             self.stop_simulation(StopReason::Solution {
-                kind: SolutionKind::Breakpoint,
+                kind: SolutionKind::Breakpoint { number: breakpoint },
             })?;
         }
         Ok(())
diff --git a/src/state/mod.rs b/src/state/mod.rs
index 80c3e91a..627eb118 100644
--- a/src/state/mod.rs
+++ b/src/state/mod.rs
@@ -21,8 +21,8 @@ pub(crate) use policy::SnapshotRestorePolicy;
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub(crate) enum SolutionKind {
     Timeout,
-    Exception,
-    Breakpoint,
+    Exception { number: i64 },
+    Breakpoint { number: i64 },
     Manual,
 }