diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d9c4fae3ade..e5f48aeb346 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-06 Mikhail Khodjaiants
+	Check if the underlying debugger supports expression evaluation in the "canEvaluate" method.
+	* CDebugTarget.java
+
 2003-05-06 Mikhail Khodjaiants
 	Added tooltips to breakpoints and watchpoints.
 	* CAddressBreakpoint.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index a101f624281..a8379672657 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -2029,6 +2029,11 @@ public class CDebugTarget extends CDebugElement
 		return null;
 	}
 
+	protected boolean supportsExpressionEvaluation()
+	{
+		return getConfiguration().supportsExpressionEvaluation();
+	}
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.ICExpressionEvaluator#evaluateExpressionToString(String)
 	 */
@@ -2050,7 +2055,7 @@ public class CDebugTarget extends CDebugElement
 	 */
 	public boolean canEvaluate()
 	{
-		return isAvailable() && isSuspended();
+		return supportsExpressionEvaluation() && isAvailable() && isSuspended();
 	}
 
 	/* (non-Javadoc)