diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
index d5b8ceb4..c040f5b7 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java
@@ -117,7 +117,11 @@ public void resume() {
 
     @Override
     public void detach() {
-        vm.dispose();
+        try {
+            vm.dispose();
+        } catch (VMDisconnectedException ex) {
+            // ignore — VM already disconnected (e.g. process was terminated first)
+        }
     }
 
     @Override
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/DisconnectRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/DisconnectRequestHandler.java
index eed3cc2e..c38af257 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/DisconnectRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/DisconnectRequestHandler.java
@@ -26,8 +26,11 @@ public void destroyDebugSession(Command command, Arguments arguments, Response r
         IDebugSession debugSession = context.getDebugSession();
         if (debugSession != null) {
             if (disconnectArguments.terminateDebuggee && !context.isAttached()) {
-                debugSession.detach();
-                debugSession.terminate();
+                try {
+                    debugSession.terminate();
+                } finally {
+                    debugSession.detach();
+                }
             } else {
                 debugSession.detach();
             }