diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeTargetManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeTargetManager.java
index ebaba53ee98..0db87ca548a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeTargetManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/IMakeTargetManager.java
@@ -21,7 +21,7 @@ public interface IMakeTargetManager {
 	void renameTarget(IMakeTarget target, String name) throws CoreException;
 
 	IMakeTarget[] getTargets(IContainer container) throws CoreException;
-	IMakeTarget findTarget(IContainer container, String name);
+	IMakeTarget findTarget(IContainer container, String name) throws CoreException;
 
 	IProject[]    getTargetBuilderProjects() throws CoreException;
 	
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
index e13e0720065..7494b1ff102 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
@@ -52,7 +52,7 @@ public class MakeBuilder extends ACBuilder {
 	public class MyResourceDeltaVisitor implements IResourceDeltaVisitor {
 		boolean bContinue;
 
-		public boolean visit(IResourceDelta delta) throws CoreException {
+		public boolean visit(IResourceDelta delta) {
 			IResource resource = delta.getResource();
 			if (resource != null && resource.getProject() == getProject()) {
 				bContinue = true;
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
index 84491a84928..e74ddd0334a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java
@@ -114,7 +114,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		return projectTargets.get(container);
 	}
 
-	public IMakeTarget findTarget(IContainer container, String name) {
+	public IMakeTarget findTarget(IContainer container, String name) throws CoreException {
 		ProjectTargets projectTargets = (ProjectTargets)projectMap.get(container.getProject());
 		if (projectTargets == null) {
 			projectTargets = readTargets(container.getProject());
@@ -256,7 +256,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		}
 	}
 
-	protected ProjectTargets readTargets(IProject project) {
+	protected ProjectTargets readTargets(IProject project) throws CoreException {
 		IPath targetFilePath =
 			MakeCorePlugin.getDefault().getStateLocation().append(project.getName()).addFileExtension(TARGETS_EXT);
 		File targetFile = targetFilePath.toFile();
@@ -268,7 +268,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 			}
 		}
 		if (projectTargets == null) {
-			projectTargets = new ProjectTargets(this, project);
+			projectTargets = new ProjectTargets(project);
 		}
 		projectMap.put(project, projectTargets);
 		return projectTargets;
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
index cb194bf114a..3baa405bb79 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java
@@ -48,22 +48,21 @@ public class ProjectTargets {
 	private HashMap targetMap = new HashMap();
 
 	private IProject project;
-	private MakeTargetManager manager;
 
-	public ProjectTargets(MakeTargetManager manager, IProject project) {
+	public ProjectTargets(IProject project) {
 		this.project = project;
-		this.manager = manager;
 	}
 
-	public ProjectTargets(MakeTargetManager manager, IProject project, InputStream input) {
-		this(manager, project);
+	public ProjectTargets(MakeTargetManager manager, IProject project, InputStream input) throws CoreException {
+		this(project);
 
 		Document document = null;
 		try {
 			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
 			document = parser.parse(input);
 		} catch (Exception e) {
-			MakeCorePlugin.log(e);
+			throw new CoreException(
+				new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, "Error reading project targets.", e));
 		}
 		Node node = document.getFirstChild();
 		if (node.getNodeName().equals(BUILD_TARGET_ELEMENT)) {
@@ -188,7 +187,7 @@ public class ProjectTargets {
 		return project;
 	}
 
-	protected Document getAsXML() throws IOException {
+	protected Document getAsXML() {
 		Document doc = new DocumentImpl();
 		Element targetsRootElement = doc.createElement(BUILD_TARGET_ELEMENT);
 		doc.appendChild(targetsRootElement);