diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
index 6d28d024afe..5cfb50f07ef 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
@@ -27,6 +27,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIVariableDescriptor;
 import org.eclipse.cdt.debug.core.cdi.model.type.ICDIArrayValue;
 import org.eclipse.cdt.debug.core.cdi.model.type.ICDIType;
 import org.eclipse.cdt.debug.core.model.CVariableFormat;
+import org.eclipse.cdt.debug.core.model.ICStackFrame;
 import org.eclipse.cdt.debug.core.model.ICType;
 import org.eclipse.cdt.debug.core.model.ICValue;
 import org.eclipse.cdt.debug.core.model.IRegisterDescriptor;
@@ -386,6 +387,13 @@ public class CRegister extends CVariable implements IRegister {
 		setDisposed( true );
 	}
 
+	protected ICStackFrame getStackFrame() {
+		ICStackFrame frame = super.getStackFrame();
+		if (frame == null)
+			frame = getCurrentStackFrame();
+		return frame;
+	}
+
 	protected CStackFrame getCurrentStackFrame() {
 		return ((CDebugTarget)getDebugTarget()).getRegisterManager().getCurrentFrame();
 	}