diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
index 16a17cd2a85..bab70aa5cfe 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 QNX Software Systems and others.
+ * Copyright (c) 2004, 2008 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -175,7 +175,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
 		}
 		if ( element instanceof ExternalTranslationUnit ) {
 			ExternalTranslationUnit etu = (ExternalTranslationUnit) element;
-			return new ExternalEditorInput( etu , new LocalFileStorage( etu.getPath().toFile() ) );
+			return new ExternalEditorInput( etu , new LocalFileStorage( etu.getLocation().toFile() ) );
 		}
 		if (element instanceof CSourceNotFoundElement)
 		{
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java
index 1f325ae6440..0006e412c61 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleBreakpointAdapter.java
@@ -364,10 +364,10 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
 	private String getSourceHandle( IDeclaration declaration ) {
 		ITranslationUnit tu = declaration.getTranslationUnit();
 		if ( tu != null ) {
-			IResource resource = tu.getResource();
-			if ( resource != null )
-				return resource.getLocation().toOSString();
-			return tu.getPath().toOSString();
+			IPath location = tu.getLocation();
+			if (location != null) {
+				return location.toOSString();
+			}
 		}
 		return ""; //$NON-NLS-1$
 	}