diff --git a/src/arch/x86_64/idt.c b/src/arch/x86_64/idt.c
index fa17cf53..6d341d9a 100644
--- a/src/arch/x86_64/idt.c
+++ b/src/arch/x86_64/idt.c
@@ -41,16 +41,18 @@ void idt_bspinit(){
 	for(size_t i = 0; i < 256; ++i){
 		idt_setentry(&idt[i], asmisr_general, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	}
-	
 
 	// set error code pushers as exceptions
-
+	
 	idt_setentry(&idt[VECTOR_DOUBLEFAULT], asmisr_except, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	idt_setentry(&idt[VECTOR_GPF], asmisr_except, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	idt_setentry(&idt[VECTOR_INVALIDTSS], asmisr_except, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	idt_setentry(&idt[VECTOR_SEGMENTNOTPRESENT], asmisr_except, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	idt_setentry(&idt[VECTOR_STACK], asmisr_except, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 
+
+	idt_setentry(&idt[VECTOR_SIMD], asmisr_simd, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
+	
 	idt_setentry(&idt[VECTOR_PF], asmisr_pagefault, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
 	
 	idt_setentry(&idt[VECTOR_PANIC], asmisr_panic, 0x28, FLAGS_PRESENT | FLAGS_TYPE_INTERRUPT, 0);
diff --git a/src/arch/x86_64/include/arch/idt.h b/src/arch/x86_64/include/arch/idt.h
index bdec3b23..a4712b1a 100644
--- a/src/arch/x86_64/include/arch/idt.h
+++ b/src/arch/x86_64/include/arch/idt.h
@@ -24,6 +24,8 @@
 #define VECTOR_GPF 13
 #define VECTOR_PF 14
 
+#define VECTOR_SIMD 0x13
+
 #define VECTOR_PANIC 0x20
 #define VECTOR_LAPICNMI 0x21
 #define VECTOR_MMUINVAL 0x22
diff --git a/src/arch/x86_64/include/arch/isr.h b/src/arch/x86_64/include/arch/isr.h
index d82a9392..1c641b19 100644
--- a/src/arch/x86_64/include/arch/isr.h
+++ b/src/arch/x86_64/include/arch/isr.h
@@ -12,5 +12,6 @@ extern void asmisr_lapicnmi();
 extern void asmisr_mmuinval();
 extern void asmisr_ps2kbd();
 extern void asmisr_timer();
+extern void asmisr_simd();
 
 #endif
diff --git a/src/arch/x86_64/isr.asm b/src/arch/x86_64/isr.asm
index 0d56457e..6523d731 100644
--- a/src/arch/x86_64/isr.asm
+++ b/src/arch/x86_64/isr.asm
@@ -157,3 +157,4 @@ isr	asmisr_lapicnmi, isr_lapicnmi
 isr	asmisr_mmuinval, isr_mmuinval
 isr 	asmisr_ps2kbd, isr_ps2kbd
 isr	asmisr_timer, isr_timer
+isr 	asmisr_simd, isr_simd
diff --git a/src/arch/x86_64/isr.c b/src/arch/x86_64/isr.c
index e0066bd3..1994ced3 100644
--- a/src/arch/x86_64/isr.c
+++ b/src/arch/x86_64/isr.c
@@ -4,14 +4,23 @@
 #include <arch/apic.h>
 #include <kernel/timer.h>
 
+void isr_simd(arch_regs *reg){
+	
+	uint64_t mxcsr;
+
+	asm volatile("stmxcsr (%%rax)" : : "a"(&mxcsr));
+
+	printf("SIMD: %p\n", mxcsr);
+	
+	_panic("SIMD exception", reg);
+}
+
 void isr_general(arch_regs *reg){
 	_panic("Unhandled interrupt", reg);
-	asm("hlt");
 }
 
 void isr_except(arch_regs *reg){
 	_panic("CPU Exception", reg);
-	asm("hlt;");
 }
 
 void isr_pagefault(arch_regs *reg){