diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index e967d15a083..e9412f00c50 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29 Mikhail Khodjaiants
+	Fix for PR 40911: Double clicking on breakpoint with no source causes internal error.
+	* CDTDebugModelPresentation.java: check if the resource associated with breakpoint is a file.
+
 2003-07-28 Mikhail Khodjaiants
 	Minimize the number of the "evaluate expression" requests when changing the value of the floating point types.
 	* CDTDebugModelPresentation.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 ff2742d4605..3851e9fc5d4 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
@@ -158,7 +158,9 @@ public class CDTDebugModelPresentation extends LabelProvider
 		}
 		if ( element instanceof ICLineBreakpoint )
 		{
-			return new FileEditorInput( (IFile)((ICLineBreakpoint)element).getMarker().getResource().getAdapter( IFile.class ) );
+			IFile file = (IFile)((ICLineBreakpoint)element).getMarker().getResource().getAdapter( IFile.class );
+			if ( file != null )
+				return new FileEditorInput( file );
 		}
 		if ( element instanceof FileStorage )
 		{