diff --git a/bl1/aarch64/early_exceptions.S b/bl1/aarch64/early_exceptions.S
index bc3e9461b0a059e3de20d30ce060f13d1bb167f1..ef47f9e33ef9e887d66d8558d1f3a2de00d769bb 100644
--- a/bl1/aarch64/early_exceptions.S
+++ b/bl1/aarch64/early_exceptions.S
@@ -114,15 +114,66 @@ SynchronousExceptionA64:
 	 * here.
 	 * ---------------------------------------------
 	 */
+	b	process_exception
+
+	.align	7
+IrqA64:
+	mov	x0, #IRQ_AARCH64
+	bl	plat_report_exception
+	b	IrqA64
+
+	.align	7
+FiqA64:
+	mov	x0, #FIQ_AARCH64
+	bl	plat_report_exception
+	b	FiqA64
+
+	.align	7
+SErrorA64:
+	mov	x0, #SERROR_AARCH64
+	bl	plat_report_exception
+	b   	SErrorA64
+
+	/* -----------------------------------------------------
+	 * Lower EL using AArch32 : 0x0 - 0x180
+	 * -----------------------------------------------------
+	 */
+	.align	7
+SynchronousExceptionA32:
+	mov	x0, #SYNC_EXCEPTION_AARCH32
+	bl	plat_report_exception
+	b	SynchronousExceptionA32
+
+	.align	7
+IrqA32:
+	mov	x0, #IRQ_AARCH32
+	bl	plat_report_exception
+	b	IrqA32
+
+	.align	7
+FiqA32:
+	mov	x0, #FIQ_AARCH32
+	bl	plat_report_exception
+	b	FiqA32
+
+	.align	7
+SErrorA32:
+	mov	x0, #SERROR_AARCH32
+	bl	plat_report_exception
+	b	SErrorA32
+
+	.align	7
+
+process_exception:
 	sub	sp, sp, #0x40
 	stp	x0, x1, [sp, #0x0]
 	stp	x2, x3, [sp, #0x10]
 	stp	x4, x5, [sp, #0x20]
 	stp	x6, x7, [sp, #0x30]
+
 	mov	x19, x0
 	mov	x20, x1
 	mov	x21, x2
-
 	mov	x0, #SYNC_EXCEPTION_AARCH64
 	bl	plat_report_exception
 
@@ -145,6 +196,7 @@ SynchronousExceptionA64:
 	ubfx	x0, x21, #MODE_EL_SHIFT, #2
 	cmp	x0, #MODE_EL3
 	b.ne	skip_mmu_teardown
+
 	/* ---------------------------------------------
 	 * If BL31 is to be executed in EL3 as well
 	 * then turn off the MMU so that it can perform
@@ -167,55 +219,11 @@ skip_mmu_teardown:
 	ldp     x0, x1, [sp, #0x0]
 	add     sp, sp, #0x40
 	eret
+
 panic:
+	wfi
 	b	panic
-	.align	7
-IrqA64:
-	mov	x0, #IRQ_AARCH64
-	bl	plat_report_exception
-	b	IrqA64
 
-	.align	7
-FiqA64:
-	mov	x0, #FIQ_AARCH64
-	bl	plat_report_exception
-	b	FiqA64
-
-	.align	7
-SErrorA64:
-	mov	x0, #SERROR_AARCH64
-	bl	plat_report_exception
-	b   	SErrorA64
-
-	/* -----------------------------------------------------
-	 * Lower EL using AArch32 : 0x0 - 0x180
-	 * -----------------------------------------------------
-	 */
-	.align	7
-SynchronousExceptionA32:
-	mov	x0, #SYNC_EXCEPTION_AARCH32
-	bl	plat_report_exception
-	b	SynchronousExceptionA32
-
-	.align	7
-IrqA32:
-	mov	x0, #IRQ_AARCH32
-	bl	plat_report_exception
-	b	IrqA32
-
-	.align	7
-FiqA32:
-	mov	x0, #FIQ_AARCH32
-	bl	plat_report_exception
-	b	FiqA32
-
-	.align	7
-SErrorA32:
-	mov	x0, #SERROR_AARCH32
-	bl	plat_report_exception
-	b	SErrorA32
-
-	.align	7
 	/* -----------------------------------------------------
 	 * BL1 redefines this function to print the fact that
 	 * BL2 has done its job and BL31 is about to be loaded.