diff --git a/platform/galileo/contiki-main.c b/platform/galileo/contiki-main.c
index 5e95c4902..13edfca2d 100644
--- a/platform/galileo/contiki-main.c
+++ b/platform/galileo/contiki-main.c
@@ -76,6 +76,14 @@ app_main(void)
   halt();
 }
 /*---------------------------------------------------------------------------*/
+static void
+gp_fault_handler(struct interrupt_context context)
+{
+  fprintf(stderr, "General protection exception @%08x (ec: %u)\n",
+          context.eip, context.error_code);
+  halt();
+}
+/*---------------------------------------------------------------------------*/
 /* Kernel entrypoint */
 int
 main(void)
@@ -91,6 +99,7 @@ main(void)
    * Galileo Gen2 FTDI header
    */
   quarkX1000_uart_init_port(QUARK_X1000_UART_1, 115200);
+  SET_EXCEPTION_HANDLER(13, 1, gp_fault_handler);
   clock_init();
   rtimer_init();