diff --git a/xtoskrnl/ar/amd64/traps.c b/xtoskrnl/ar/amd64/traps.c
index 86d0881..b3dae0d 100644
--- a/xtoskrnl/ar/amd64/traps.c
+++ b/xtoskrnl/ar/amd64/traps.c
@@ -10,7 +10,37 @@
 
 
 /**
- * Handles the trap 0x02 (Non Maskable Interrupt) gracefully.
+ * Handles the trap 0x00 when a Divide By Zero exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap00()
+{
+    LdrPrint(L"Handled Division-By-Zero Error (0x00)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x01 when Debug exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap01()
+{
+    LdrPrint(L"Handled Debug exception (0x01)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x02 when Non-Maskable Interrupt (NMI) occurs.
  *
  * @return This routine does not return any value.
  *
@@ -20,12 +50,87 @@ XTCDECL
 VOID
 ArpHandleTrap02()
 {
-    LdrPrint(L"Handled Non-Maskable Interrupt (0x02)!\n");
+    LdrPrint(L"Handled Non-Maskable-Interrupt (0x02)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x08 (Double Fault) gracefully.
+ * Handles the trap 0x03 when the INT3 instruction is executed.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap03()
+{
+    LdrPrint(L"Handled INT3 (0x03)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x04 when the INTO instruction is executed and overflow bit is set.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap04()
+{
+    LdrPrint(L"Handled Overflow exception (0x04)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x05 when the Bound Range Exceeded exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap05()
+{
+    LdrPrint(L"Handled Bound-Range-Exceeded exception (0x05)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x06 when the Invalid Opcode exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap06()
+{
+    LdrPrint(L"Handled Invalid Opcode exception (0x06)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x07 when the Device Not Available exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap07()
+{
+    LdrPrint(L"Handled Device Not Available exception (0x07)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x08 when Double Fault exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -35,12 +140,72 @@ XTCDECL
 VOID
 ArpHandleTrap08()
 {
-    LdrPrint(L"Handled Double Fault exception (0x08)!\n");
+    LdrPrint(L"Handled Double-Fault exception (0x08)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x0E (Page Fault) gracefully.
+ * Handles the trap 0x09 when the Segment Overrun exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap09()
+{
+    LdrPrint(L"Handled Segment-Overrun exception (0x09)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0A when the Invalid TSS exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0A()
+{
+    LdrPrint(L"Handled Invalid-TSS exception (0x0A)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0B when the Segment Not Present exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0B()
+{
+    LdrPrint(L"Handled Segment-Not-Present exception (0x0B)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0C when the Stack Segment Fault exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0C()
+{
+    LdrPrint(L"Handled Stack-Segment-Fault exception (0x0C)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0D when General Protection Fault (GPF) exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -50,12 +215,12 @@ XTCDECL
 VOID
 ArpHandleTrap0D()
 {
-    LdrPrint(L"Handled General Protection Fault (0x0D)!\n");
+    LdrPrint(L"Handled General-Protection-Fault (0x0D)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x0E (Page Fault) gracefully.
+ * Handles the trap 0x0E when the Page Fault (PF) exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -65,12 +230,102 @@ XTCDECL
 VOID
 ArpHandleTrap0E()
 {
-    LdrPrint(L"Handled Page Fault exception (0x0E)!\n");
+    LdrPrint(L"Handled Page-Fault exception (0x0E)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0xFF (Unexpected Interrupt) gracefully.
+ * Handles the trap 0x10 when the X87 Floating-Point exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap10()
+{
+    LdrPrint(L"Handled x87 Floating-Point exception (0x10)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x11 when the Alignment Check exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap11()
+{
+    LdrPrint(L"Handled Alignment-Check exception (0x11)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x12 when the Machine Check exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap12()
+{
+    LdrPrint(L"Handled Machine-Check exception (0x12)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x13 when the SIMD Floating-Point exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap13()
+{
+    LdrPrint(L"Handled SIMD Floating-Point exception (0x13)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x2C when an assertion is raised.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap2C()
+{
+    LdrPrint(L"Handled Assertion (0x2C)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x2D when a debug service is being requested.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap2D()
+{
+    LdrPrint(L"Handled Debug-Service-Request (0x2D)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0xFF then Unexpected Interrupt occurs.
  *
  * @return This routine does not return any value.
  *
@@ -80,6 +335,6 @@ XTCDECL
 VOID
 ArpHandleTrapFF()
 {
-    LdrPrint(L"Handled Unexpected Interrupt (0xFF)!\n");
+    LdrPrint(L"Handled Unexpected-Interrupt (0xFF)!\n");
     for(;;);
 }
diff --git a/xtoskrnl/ar/i686/traps.c b/xtoskrnl/ar/i686/traps.c
index eb74aa4..1ebe39c 100644
--- a/xtoskrnl/ar/i686/traps.c
+++ b/xtoskrnl/ar/i686/traps.c
@@ -10,7 +10,37 @@
 
 
 /**
- * Handles the trap 0x02 (Non Maskable Interrupt) gracefully.
+ * Handles the trap 0x00 when a Divide By Zero exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap00()
+{
+    LdrPrint(L"Handled Division-By-Zero Error (0x00)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x01 when Debug exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap01()
+{
+    LdrPrint(L"Handled Debug exception (0x01)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x02 when Non-Maskable Interrupt (NMI) occurs.
  *
  * @return This routine does not return any value.
  *
@@ -20,12 +50,87 @@ XTCDECL
 VOID
 ArpHandleTrap02()
 {
-    LdrPrint(L"Handled Non-Maskable Interrupt (0x02)!\n");
+    LdrPrint(L"Handled Non-Maskable-Interrupt (0x02)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x08 (Double Fault) gracefully.
+ * Handles the trap 0x03 when the INT3 instruction is executed.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap03()
+{
+    LdrPrint(L"Handled INT3 (0x03)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x04 when the INTO instruction is executed and overflow bit is set.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap04()
+{
+    LdrPrint(L"Handled Overflow exception (0x04)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x05 when the Bound Range Exceeded exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap05()
+{
+    LdrPrint(L"Handled Bound-Range-Exceeded exception (0x05)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x06 when the Invalid Opcode exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap06()
+{
+    LdrPrint(L"Handled Invalid Opcode exception (0x06)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x07 when the Device Not Available exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap07()
+{
+    LdrPrint(L"Handled Device Not Available exception (0x07)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x08 when Double Fault exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -35,12 +140,72 @@ XTCDECL
 VOID
 ArpHandleTrap08()
 {
-    LdrPrint(L"Handled Double Fault exception (0x08)!\n");
+    LdrPrint(L"Handled Double-Fault exception (0x08)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x0E (Page Fault) gracefully.
+ * Handles the trap 0x09 when the Segment Overrun exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap09()
+{
+    LdrPrint(L"Handled Segment-Overrun exception (0x09)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0A when the Invalid TSS exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0A()
+{
+    LdrPrint(L"Handled Invalid-TSS exception (0x0A)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0B when the Segment Not Present exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0B()
+{
+    LdrPrint(L"Handled Segment-Not-Present exception (0x0B)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0C when the Stack Segment Fault exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap0C()
+{
+    LdrPrint(L"Handled Stack-Segment-Fault exception (0x0C)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x0D when General Protection Fault (GPF) exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -50,12 +215,12 @@ XTCDECL
 VOID
 ArpHandleTrap0D()
 {
-    LdrPrint(L"Handled General Protection Fault (0x0D)!\n");
+    LdrPrint(L"Handled General-Protection-Fault (0x0D)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0x0E (Page Fault) gracefully.
+ * Handles the trap 0x0E when the Page Fault (PF) exception occurs.
  *
  * @return This routine does not return any value.
  *
@@ -65,12 +230,102 @@ XTCDECL
 VOID
 ArpHandleTrap0E()
 {
-    LdrPrint(L"Handled Page Fault exception (0x0E)!\n");
+    LdrPrint(L"Handled Page-Fault exception (0x0E)!\n");
     for(;;);
 }
 
 /**
- * Handles the trap 0xFF (Unexpected Interrupt) gracefully.
+ * Handles the trap 0x10 when the X87 Floating-Point exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap10()
+{
+    LdrPrint(L"Handled x87 Floating-Point exception (0x10)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x11 when the Alignment Check exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap11()
+{
+    LdrPrint(L"Handled Alignment-Check exception (0x11)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x12 when the Machine Check exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap12()
+{
+    LdrPrint(L"Handled Machine-Check exception (0x12)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x13 when the SIMD Floating-Point exception occurs.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap13()
+{
+    LdrPrint(L"Handled SIMD Floating-Point exception (0x13)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x2C when an assertion is raised.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap2C()
+{
+    LdrPrint(L"Handled Assertion (0x2C)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0x2D when a debug service is being requested.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTCDECL
+VOID
+ArpHandleTrap2D()
+{
+    LdrPrint(L"Handled Debug-Service-Request (0x2D)!\n");
+    for(;;);
+}
+
+/**
+ * Handles the trap 0xFF then Unexpected Interrupt occurs.
  *
  * @return This routine does not return any value.
  *
@@ -80,6 +335,6 @@ XTCDECL
 VOID
 ArpHandleTrapFF()
 {
-    LdrPrint(L"Handled Unexpected Interrupt (0xFF)!\n");
+    LdrPrint(L"Handled Unexpected-Interrupt (0xFF)!\n");
     for(;;);
 }
diff --git a/xtoskrnl/includes/arpfuncs.h b/xtoskrnl/includes/arpfuncs.h
index 36334f1..d9c2e6b 100644
--- a/xtoskrnl/includes/arpfuncs.h
+++ b/xtoskrnl/includes/arpfuncs.h
@@ -12,14 +12,58 @@
 #include <xtos.h>
 
 
+XTCDECL
+VOID
+ArpHandleTrap00();
+
+XTCDECL
+VOID
+ArpHandleTrap01();
+
 XTCDECL
 VOID
 ArpHandleTrap02();
 
+XTCDECL
+VOID
+ArpHandleTrap03();
+
+XTCDECL
+VOID
+ArpHandleTrap04();
+
+XTCDECL
+VOID
+ArpHandleTrap05();
+
+XTCDECL
+VOID
+ArpHandleTrap06();
+
+XTCDECL
+VOID
+ArpHandleTrap07();
+
 XTCDECL
 VOID
 ArpHandleTrap08();
 
+XTCDECL
+VOID
+ArpHandleTrap09();
+
+XTCDECL
+VOID
+ArpHandleTrap0A();
+
+XTCDECL
+VOID
+ArpHandleTrap0B();
+
+XTCDECL
+VOID
+ArpHandleTrap0C();
+
 XTCDECL
 VOID
 ArpHandleTrap0D();
@@ -28,6 +72,30 @@ XTCDECL
 VOID
 ArpHandleTrap0E();
 
+XTCDECL
+VOID
+ArpHandleTrap10();
+
+XTCDECL
+VOID
+ArpHandleTrap11();
+
+XTCDECL
+VOID
+ArpHandleTrap12();
+
+XTCDECL
+VOID
+ArpHandleTrap13();
+
+XTCDECL
+VOID
+ArpHandleTrap2C();
+
+XTCDECL
+VOID
+ArpHandleTrap2D();
+
 XTCDECL
 VOID
 ArpHandleTrapFF();