diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index 8f5199440..51ecab864 100644
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -90,6 +90,7 @@ void  __attribute__((weak)) vApplicationStackOverflowHook( TaskHandle_t xTask, s
 	panicPutStr("***ERROR*** A stack overflow in task ");
 	panicPutStr((char*)pcTaskName);
 	panicPutStr(" has been detected.\r\n");
+	configASSERT(0);
 }
 
 static const char *edesc[]={
diff --git a/components/freertos/xtensa_intr.c b/components/freertos/xtensa_intr.c
index e9c0b79b9..2f5dc3542 100644
--- a/components/freertos/xtensa_intr.c
+++ b/components/freertos/xtensa_intr.c
@@ -101,8 +101,7 @@ extern xt_handler_table_entry _xt_interrupt_table[XCHAL_NUM_INTERRUPTS*portNUM_P
 */
 void xt_unhandled_interrupt(void * arg)
 {
-	ets_printf("Unhandled interrupt!\n");
-    //exit(-1);
+	ets_printf("Unhandled interrupt %d on cpu %d!\n", (int)arg, xPortGetCoreID());
 }