diff --git a/sw/bootloader/src/exception.c b/sw/bootloader/src/exception.c
index c53ac92..457573a 100644
--- a/sw/bootloader/src/exception.c
+++ b/sw/bootloader/src/exception.c
@@ -187,12 +187,13 @@ void exception_fatal_handler (uint32_t exception_code, uint32_t interrupt_mask,
 
     exception_init_screen();
 
-    exception_print("branch: %s\n", version->git_branch);
-    exception_print("tag: %s\n", version->git_tag);
+    exception_print("branch: %s | tag: %s\n", version->git_branch, version->git_tag);
     exception_print("sha: %s\n", version->git_sha);
-    exception_print("message: %s\n\n", version->git_message);
+    exception_print("%s\n\n", version->git_message);
+
     exception_print("%s\n\n", exception_get_description(exception_code));
-    exception_print("pc: 0x%08lX  sr: 0x%08lX  cr: 0x%08lX  hw: 0x%08lX  [%.4s]\n", e->epc.u32, e->sr, e->cr, sc64_version, (char *) (&sc64_version));
+
+    exception_print("pc: 0x%08lX  sr: 0x%08lX  cr: 0x%08lX  hw: 0x%08lX\n", e->epc.u32, e->sr, e->cr, sc64_version);
     exception_print("zr: 0x%08lX  at: 0x%08lX  v0: 0x%08lX  v1: 0x%08lX\n", e->zr.u32, e->at.u32, e->v0.u32, e->v1.u32);
     exception_print("a0: 0x%08lX  a1: 0x%08lX  a2: 0x%08lX  a3: 0x%08lX\n", e->a0.u32, e->a1.u32, e->a2.u32, e->a3.u32);
     exception_print("t0: 0x%08lX  t1: 0x%08lX  t2: 0x%08lX  t3: 0x%08lX\n", e->t0.u32, e->t1.u32, e->t2.u32, e->t3.u32);