Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 73530d97ea6d30fa28964adee59eaccf93f77a8e)
+++ libcfa/src/Makefile.am	(revision f1b667186cc9c53fcf26d8e55e9d328e504edc58)
@@ -33,5 +33,5 @@
 # The built sources must not depend on the installed headers
 AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
-AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
+AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 CFACC = @CFACC@
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 73530d97ea6d30fa28964adee59eaccf93f77a8e)
+++ libcfa/src/Makefile.in	(revision f1b667186cc9c53fcf26d8e55e9d328e504edc58)
@@ -456,5 +456,5 @@
 # The built sources must not depend on the installed headers
 AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
-AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
+AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
 @BUILDLIB_FALSE@headers_nosrc = 
Index: libcfa/src/exception.c
===================================================================
--- libcfa/src/exception.c	(revision 73530d97ea6d30fa28964adee59eaccf93f77a8e)
+++ libcfa/src/exception.c	(revision f1b667186cc9c53fcf26d8e55e9d328e504edc58)
@@ -10,6 +10,6 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 03 11:57:00 2020
-// Update Count     : 14
+// Last Modified On : Mon Apr 06 14:40:00 2020
+// Update Count     : 15
 //
 
@@ -75,4 +75,8 @@
 // RESUMPTION ================================================================
 
+static void reset_top_resume(struct __cfaehm_try_resume_node ** store) {
+	this_exception_context()->top_resume = *store;
+}
+
 void __cfaehm_throw_resume(exception_t * except) {
 	struct exception_context_t * context = this_exception_context();
@@ -80,4 +84,5 @@
 	__cfaabi_dbg_print_safe("Throwing resumption exception\n");
 
+	__attribute__((cleanup(reset_top_resume)))
 	struct __cfaehm_try_resume_node * original_head = context->top_resume;
 	struct __cfaehm_try_resume_node * current = context->top_resume;
@@ -86,5 +91,4 @@
 		context->top_resume = current->next;
 		if (current->handler(except)) {
-			context->top_resume = original_head;
 			return;
 		}
@@ -92,5 +96,4 @@
 
 	__cfaabi_dbg_print_safe("Unhandled exception\n");
-	context->top_resume = original_head;
 
 	// Fall back to termination: