diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index ee4506e389d..a9e531f6e41 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-23 Mikhail Khodjaiants
+	More informative error messages.
+	* CDebugUIMessages.properties
+	* CDTDebugModelPresentation.java
+
 2004-07-20 Mikhail Khodjaiants
 	Cleanup.
 	* ErrorStatusHandler.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
index d64c46faa24..e3e3e774e6e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
@@ -342,7 +342,7 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
 			}
 		}
 		catch( DebugException e ) {
-			return CDebugUIMessages.getString( "CDTDebugModelPresentation.2" ); //$NON-NLS-1$
+			return MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.2" ), new String[] { e.getMessage() } ); //$NON-NLS-1$
 		}
 		catch( CoreException e ) {
 			CDebugUIPlugin.log( e );
@@ -771,7 +771,7 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
 			}
 			if ( type != null && (type.isPointer() || type.isReference()) )
 				return fDebugImageRegistry.get( (((ICVariable)element).isEnabled()) ? CDebugImages.DESC_OBJS_VARIABLE_POINTER : CDebugImages.DESC_OBJS_VARIABLE_POINTER_DISABLED );
-			else if ( ((ICVariable)element).hasChildren() )
+			else if ( type != null && (type.isArray() || type.isStructure()) )
 				return fDebugImageRegistry.get( (((ICVariable)element).isEnabled()) ? CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE : CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE_DISABLED );
 			else
 				return fDebugImageRegistry.get( (((ICVariable)element).isEnabled()) ? CDebugImages.DESC_OBJS_VARIABLE_SIMPLE : CDebugImages.DESC_OBJS_VARIABLE_SIMPLE_DISABLED );
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
index ee435944e3b..f0aead3e162 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
@@ -14,7 +14,7 @@ CDebugImageDescriptorRegistry.0=Allocating image for wrong display.
 CDebugModelPresentation.not_available_1=<not available>
 CDTDebugModelPresentation.0=<terminated>
 CDTDebugModelPresentation.1=<disconnected>
-CDTDebugModelPresentation.2=<not_responding>
+CDTDebugModelPresentation.2=<not available: {0}>
 CDTDebugModelPresentation.3={0} (Exited.{1})
 CDTDebugModelPresentation.5=Signal ''{0}'' received. Description: {1}.
 CDTDebugModelPresentation.6=Exit code = {0}.