diff --git a/include/ipc_handler.h b/include/ipc_handler.h
index d14643c..5df65a1 100644
--- a/include/ipc_handler.h
+++ b/include/ipc_handler.h
@@ -78,8 +78,8 @@
 typedef enum
 {
 	IPC_CMD11_PRINT_MSG        = CMD_ID(0)  | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15), // Invalid on purpose. Will be decided later.
-	IPC_CMD11_PANIC            = CMD_ID(1)  | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15),
-	IPC_CMD11_EXCEPTION        = CMD_ID(2)  | CMD_IN_BUFS(15) | CMD_OUT_BUFS(15) | CMD_PARAMS(15)
+	IPC_CMD11_PANIC            = CMD_ID(1)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0),
+	IPC_CMD11_EXCEPTION        = CMD_ID(2)  | CMD_IN_BUFS(0)  | CMD_OUT_BUFS(0)  | CMD_PARAMS(0)
 } IpcCmd11;
 
 #undef CMD_ID
diff --git a/source/arm9/debug.c b/source/arm9/debug.c
index 2f72a66..c95b041 100644
--- a/source/arm9/debug.c
+++ b/source/arm9/debug.c
@@ -53,13 +53,10 @@
 
 noreturn void panic()
 {
-	//register u32 lr __asm__("lr");
-
 	enterCriticalSection();
-
 	fsDeinit();
-
 	PXI_sendCmd(IPC_CMD11_PANIC, NULL, 0);
+
 	while(1)
 	{
 		const u32 color = RGB8_to_565(0, 255, 0)<<16 | RGB8_to_565(0, 255, 0);
@@ -70,13 +67,10 @@
 
 noreturn void panicMsg(UNUSED const char *msg)
 {
-	//register u32 lr __asm__("lr");
-
 	enterCriticalSection();
-
 	fsDeinit();
-
 	PXI_sendCmd(IPC_CMD11_PANIC, NULL, 0);
+
 	while(1)
 	{
 		const u32 color = RGB8_to_565(0, 255, 0)<<16 | RGB8_to_565(0, 255, 0);
@@ -91,8 +85,8 @@
 {
 	// avoid fs corruptions
 	fsDeinit();
-
 	PXI_sendCmd(IPC_CMD11_EXCEPTION, NULL, 0);
+
 	while(1)
 	{
 		const u32 color = RGB8_to_565(255, 0, 0)<<16 | RGB8_to_565(255, 0, 0);