diff --git a/lib/chatter.cc b/lib/chatter.cc
index e5a24f9..9f998e9 100644
--- a/lib/chatter.cc
+++ b/lib/chatter.cc
@@ -146,7 +146,7 @@ namespace crucible {
 
 	ChatterUnwinder::~ChatterUnwinder()
 	{
-		if (uncaught_exception()) {
+		if (current_exception()) {
 			m_func();
 		}
 	}
diff --git a/src/bees.cc b/src/bees.cc
index 5ccfe4d..bdabec1 100644
--- a/src/bees.cc
+++ b/src/bees.cc
@@ -82,7 +82,7 @@ thread_local bool BeesTracer::tl_silent = false;
 
 BeesTracer::~BeesTracer()
 {
-	if (!tl_silent && uncaught_exception()) {
+	if (!tl_silent && current_exception()) {
 		try {
 			m_func();
 		} catch (exception &e) {