diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index f0fbc79717d..c9019dfc5d0 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-01 Mikhail Khodjaiants
+	Fix for bug 73197: DisassemblyEditorInput.getAddress can crash.
+	* DisassemblyEditorInput.java
+
 2004-09-01 Mikhail Khodjaiants
 	Breakpoint filtering by targets (ui).
 	* PropertyPageMessages.properties
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
index 10547a187a6..da04083f085 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
@@ -165,7 +165,7 @@ public class DisassemblyEditorInput implements IEditorInput {
 			for ( int i = 0; i < lines.length; ++i ) {
 				IAsmInstruction[] instructions = lines[i].getInstructions();
 				++current;
-				if ( lineNumber == current )
+				if ( lineNumber == current && instructions.length > 0 )
 					return instructions[0].getAdress();
 				if ( lineNumber > current && lineNumber <= current + instructions.length )
 					return instructions[lineNumber - current - 1].getAdress();