diff --git a/crates/fj-kernel/src/services/validation.rs b/crates/fj-kernel/src/services/validation.rs
index a0db159ed..55aeda512 100644
--- a/crates/fj-kernel/src/services/validation.rs
+++ b/crates/fj-kernel/src/services/validation.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, thread};
 
 use crate::{
     objects::{BehindHandle, Object},
@@ -23,7 +23,9 @@ impl Drop for Validation {
                 println!("{err}");
             }
 
-            panic!();
+            if !thread::panicking() {
+                panic!();
+            }
         }
     }
 }