diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 46e1d3c98df..f9106185162 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24 David Inglis
+	* CDebugTarget.java
+	fix exception on shutdown with a connected target, CDI session
+	was not terminated.
+	
 2002-10-23 Mikhail Khodjaiants
 	Support for debugger console.
 	* CDebugModel.java: new factory methods for CDebugTarget
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 56b4b807aba..3357e394d59 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -712,6 +712,7 @@ public class CDebugTarget extends CDebugElement
 		try
 		{
 			getCDITarget().disconnect();
+			getCDISession().terminate();
 		}
 		catch( CDIException e )
 		{