diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index a3905df2719..0fcd46f2c6d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -525,9 +525,11 @@ public class VariableManager extends SessionObject implements ICDIVariableManage
 			ICDIThread currentThread = currentTarget.getCurrentThread();
 			if (currentThread != null) {
 				currentStack = currentThread.getCurrentStackFrame();
-				high = currentStack.getLevel();
+				if (currentStack != null) {
+					high = currentStack.getLevel();
+				}
 				if (high > 0) {
-					high--;
+						high--;
 				}
 				low = high - MAX_STACK_DEPTH;
 				if (low < 0) {