diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
index a8488ad6055..03359f585a3 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Thread.java
@@ -186,7 +186,12 @@ public class Thread extends CObject implements ICDIThread {
 			} catch (MIException e) {
 				throw new MI2CDIException(e);
 			} finally {
+				try {
 				target.setCurrentThread(currentThread, false);
+				} catch (MI2CDIException e) {
+					target.releaseTarget();
+					throw e;
+				}
 				target.releaseTarget();
 			}
 		}