diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java
index 176e56af2ab..929adf5f738 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitInfo.java
@@ -6,20 +6,24 @@
 package org.eclipse.cdt.debug.mi.core.cdi;
 
 import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo;
+import org.eclipse.cdt.debug.mi.core.event.MIInferiorExitEvent;
 
 /**.
  */
 public class ExitInfo extends SessionObject implements ICDIExitInfo {
 
-	public ExitInfo(CSession session) {
+	MIInferiorExitEvent event;
+
+	public ExitInfo(CSession session, MIInferiorExitEvent e) {
 		super(session);
+		event = e;
 	}
 	
 	/**
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExitInfo#getCode()
 	 */
 	public int getCode() {
-		return getCSession().getCTarget().getProcess().exitValue();
+		return event.getExitCode();
 	}
 
 }
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitedEvent.java
index 5fea7485da3..f32c71b46f5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitedEvent.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExitedEvent.java
@@ -26,7 +26,7 @@ public class ExitedEvent implements ICDIExitedEvent {
 	 * @see org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent#getExitInfo()
 	 */
 	public ICDIExitInfo getExitInfo() {
-		return new ExitInfo(session);
+		return new ExitInfo(session, event);
 	}
 
 	/**