diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d8db53ab1c3..6fb5f670db7 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-18 Mikhail Khodjaiants
+	Check if CValue has variables before calling 'getCDIVariables'.
+	* CValue.java
+
 2002-12-17 Mikhail Khodjaiants
 	Formatting 'char' types.
 	* CValue.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
index 146a1c912ac..558cd21f324 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java
@@ -122,7 +122,7 @@ public class CValue extends CDebugElement implements ICValue
 
 	protected synchronized List getVariables0() throws DebugException 
 	{
-		if ( !isAllocated() )
+		if ( !isAllocated() || !hasVariables() )
 			return Collections.EMPTY_LIST;
 		if ( fVariables.size() == 0 )
 		{