diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index a502d909d6b..e2f5352a516 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13 Mikhail Khodjaiants
+	Changed the format of the disassembly error messages.
+	* Disassembly.java
+	* CoreModelMessages.properties
+
 2004-05-13 Mikhail Khodjaiants
 	Removed old disassembly implementation.
 	* IDisassemblyStorage.java: deleted
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties
index 027757694c3..6a4cbf2b34f 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties
@@ -1,3 +1 @@
 CDebugTarget.Unable_to_get_globals_1=Unable to get globals. Reason: 
-Disassembly.Unable_to_get_disassembly_instructions_1=Unable to get disassembly instructions.
-Disassembly.Unable_to_get_disassembly_instructions_2=Unable to get disassembly instructions.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
index f9b848cefbb..58f319f7d43 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/Disassembly.java
@@ -69,7 +69,7 @@ public class Disassembly extends CDebugElement implements IDisassembly {
 															   CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) );
 					}
 					catch( CDIException e ) {
-						targetRequestFailed( CoreModelMessages.getString( "Disassembly.Unable_to_get_disassembly_instructions_1" ), e ); //$NON-NLS-1$
+						targetRequestFailed( e.getMessage(), e );
 					}
 				}
 				if ( mixedInstrs.length == 0 ||
@@ -81,7 +81,7 @@ public class Disassembly extends CDebugElement implements IDisassembly {
 							return DisassemblyBlock.create( this, instructions );
 						}
 						catch( CDIException e ) {
-							targetRequestFailed( CoreModelMessages.getString( "Disassembly.Unable_to_get_disassembly_instructions_2" ), e ); //$NON-NLS-1$
+							targetRequestFailed( e.getMessage(), e );
 						}
 					}
 				}