diff --git a/tftf/framework/aarch64/exceptions.S b/tftf/framework/aarch64/exceptions.S
index 3dedb92..471bef7 100644
--- a/tftf/framework/aarch64/exceptions.S
+++ b/tftf/framework/aarch64/exceptions.S
@@ -40,7 +40,9 @@
 end_vector_entry irq_sp_elx
 
 unhandled_exception fiq_sp_elx
-unhandled_exception serror_sp_elx
+vector_entry serror_sp_elx
+	b	serror_vector_entry
+end_vector_entry serror_sp_elx
 
 	/*
 	 * Lower EL using AArch64 : 0x400 - 0x600.
@@ -122,6 +124,21 @@
 	eret
 endfunc irq_vector_entry
 
+func serror_vector_entry
+	sub	sp, sp, #0x100
+	save_gp_regs
+	bl	tftf_serror_handler
+	cbnz	x0, 1f
+	mov	x0, x19
+	/* Save original stack pointer value on the stack */
+	add	x1, x0, #0x100
+	str	x1, [x0, #0xf8]
+	b	print_exception
+1:	restore_gp_regs
+	add	sp, sp, #0x100
+	eret
+endfunc serror_vector_entry
+
 func crash_dump
 	/* Save general-purpose registers on the stack. */
 	sub	sp, sp, #0x100
diff --git a/tftf/framework/framework.mk b/tftf/framework/framework.mk
index ddae823..ef59502 100644
--- a/tftf/framework/framework.mk
+++ b/tftf/framework/framework.mk
@@ -82,6 +82,7 @@
 # ARMv8.3 Pointer Authentication support files
 FRAMEWORK_SOURCES	+=						\
 	lib/exceptions/aarch64/sync.c					\
+	lib/exceptions/aarch64/serror.c					\
 	lib/extensions/pauth/aarch64/pauth.c				\
 	lib/extensions/pauth/aarch64/pauth_helpers.S			\
 	lib/extensions/sme/aarch64/sme.c				\