diff --git a/exception.c b/exception.c
index 813539a..42d36c8 100644
--- a/exception.c
+++ b/exception.c
@@ -49,8 +49,10 @@ void exc_handler(u32 type, u32 spsr, u32 *regs)
 	u32 pc, fsr;
 
 	switch(type) {
-		case 7: // FIQ
+		case 1: // UND
+		case 2: // SWI
 		case 3: // INSTR ABORT
+		case 7: // FIQ
 			pc = regs[15] - 4;
 			break;
 		case 4: // DATA ABORT