diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
index 84ae7a64ff..495830b9c4 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
@@ -15,7 +15,7 @@
  */
 package agent.gdb.manager.impl;
 
-import static ghidra.async.AsyncUtils.*;
+import static ghidra.async.AsyncUtils.loop;
 
 import java.io.*;
 import java.util.*;
@@ -654,6 +654,9 @@ public class GdbManagerImpl implements GdbManager {
 		if (gdbWaiter != null) {
 			gdbWaiter.interrupt();
 		}
+		if (gdb != null) {
+			gdb.destroyForcibly();
+		}
 		try {
 			if (cliThread != null) {
 				cliThread.interrupt();
@@ -667,9 +670,6 @@ public class GdbManagerImpl implements GdbManager {
 		catch (IOException e) {
 			Msg.error(this, "Problem closing PTYs to GDB.");
 		}
-		if (gdb != null) {
-			gdb.destroyForcibly();
-		}
 		DebuggerModelTerminatingException reason =
 			new DebuggerModelTerminatingException(GDB_IS_TERMINATING);
 		cmdLock.dispose(reason);