diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index ab0645850c3..717f847bb99 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-30 Mikhail Khodjaiants
+	Disassembly editor input fix.
+	* CDTDebugModelPresentation.java
+	
 2003-01-27 Mikhail Khodjaiants
 	Managing breakpoints from the gdb console.
 	* AddAddressBreakpointActionDelegate.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 b84c8be772a..614c0c2a093 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
@@ -826,7 +826,9 @@ public class CDTDebugModelPresentation extends LabelProvider
 					try
 					{
 						long address = Long.parseLong( breakpoint.getAddress() );
-						return new DisassemblyEditorInput( (IStorage)(((DisassemblyManager)targets[i].getAdapter( DisassemblyManager.class )).getSourceElement( address ) ) );
+						IStorage storage = (IStorage)(((DisassemblyManager)targets[i].getAdapter( DisassemblyManager.class )).getSourceElement( address ) );
+						if ( storage != null )
+							return new DisassemblyEditorInput( storage );
 					}
 					catch( NumberFormatException e )
 					{