diff --git a/src/Ryujinx.HLE/Debugger/Debugger.cs b/src/Ryujinx.HLE/Debugger/Debugger.cs
index 4350aab53..608ab977a 100644
--- a/src/Ryujinx.HLE/Debugger/Debugger.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.cs
@@ -208,30 +208,40 @@ namespace Ryujinx.HLE.Debugger
             while (!_shuttingDown)
             {
                 IMessage msg = Messages.Take();
-                switch (msg)
+                try {
+                    switch (msg)
+                    {
+                        case BreakInMessage:
+                            Logger.Notice.Print(LogClass.GdbStub, "Break-in requested");
+                            CommandQuery();
+                            break;
+
+                        case SendNackMessage:
+                            WriteStream.WriteByte((byte)'-');
+                            break;
+
+                        case CommandMessage { Command: var cmd }:
+                            Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
+                            WriteStream.WriteByte((byte)'+');
+                            ProcessCommand(cmd);
+                            break;
+
+                        case ThreadBreakMessage { Context: var ctx }:
+                            DebugProcess.DebugStop();
+                            Reply($"T05thread:{ctx.ThreadUid:x};");
+                            break;
+
+                        case KillMessage:
+                            return;
+                    }
+                }
+                catch (IOException e)
                 {
-                    case BreakInMessage:
-                        Logger.Notice.Print(LogClass.GdbStub, "Break-in requested");
-                        CommandQuery();
-                        break;
-
-                    case SendNackMessage:
-                        WriteStream.WriteByte((byte)'-');
-                        break;
-
-                    case CommandMessage { Command: var cmd }:
-                        Logger.Debug?.Print(LogClass.GdbStub, $"Received Command: {cmd}");
-                        WriteStream.WriteByte((byte)'+');
-                        ProcessCommand(cmd);
-                        break;
-
-                    case ThreadBreakMessage { Context: var ctx }:
-                        DebugProcess.DebugStop();
-                        Reply($"T05thread:{ctx.ThreadUid:x};");
-                        break;
-
-                    case KillMessage:
-                        return;
+                    Logger.Error?.Print(LogClass.GdbStub, "Error while processing GDB messages", e);
+                }
+                catch (NullReferenceException e)
+                {
+                    Logger.Error?.Print(LogClass.GdbStub, "Error while processing GDB messages", e);
                 }
             }
         }