diff --git a/src/arch/aarch64/fault.c b/src/arch/aarch64/fault.c
index efd5df43..28506669 100644
--- a/src/arch/aarch64/fault.c
+++ b/src/arch/aarch64/fault.c
@@ -467,6 +467,10 @@ bool fault_handle(size_t vcpu_id, microkit_msginfo msginfo)
     }
 
     if (!success) {
+        /* Dump the TCB and vCPU registers to hopefully get information as
+         * to what has gone wrong. */
+        tcb_print_regs(vcpu_id);
+        vcpu_print_regs(vcpu_id);
         LOG_VMM_ERR("Failed to handle %s fault\n", fault_to_string(label));
     }