diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 1cc95955093..928b8a722d0 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,6 @@
+2003-10-29 Mikhail Khodjaiants
+	* CProjectSourceLocation.java: check if the searched element name is not null or empty.
+
 2003-10-29 Mikhail Khodjaiants
 	Added the 'dispose' method to 'ICSourceLocation'.
 	* ICSourceLocation.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
index 587d08ab247..0f7c9328cc9 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CProjectSourceLocation.java
@@ -96,7 +96,7 @@ public class CProjectSourceLocation implements IProjectSourceLocation
 	public Object findSourceElement( String name ) throws CoreException
 	{
 		Object result = null;
-		if ( getProject() != null && !notFoundCacheLookup( name ) )
+		if ( !isEmpty( name ) && getProject() != null && !notFoundCacheLookup( name ) )
 		{
 			result = cacheLookup( name );
 			if ( result == null )