diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
index 852925d8fe1..2bf13763bcc 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
@@ -38,7 +38,13 @@ public class CThread extends CObject implements ICDIThread {
 		return Integer.toString(id);
 	}
 
-	StackFrame getCurrentStackFrame() {
+	StackFrame getCurrentStackFrame() throws CDIException {
+		if (currentFrame == null) {
+			ICDIStackFrame[] frames = getStackFrames();
+			if (frames.length > 0) {
+				currentFrame = (StackFrame)frames[0];
+			}
+		}
 		return currentFrame;
 	}