diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
index 60060654f3e..5c3d9f05857 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildDescription.java
@@ -1937,6 +1937,12 @@ public class BuildDescription implements IBuildDescription {
 
 	private BuildResource addInput(String path, BuildIOType buildArg){
 		if(path.length() > 0){
+			if(path.length() >= 2){
+				// Unquote path potentially quoted by FileListControl.getNewInputObject()
+				if(path.charAt(0) == '"' && path.charAt(path.length() -1) == '"') {
+					path = path.substring(1, path.length() -1);
+				}
+			}
 			IPath pPath = Path.fromOSString(path);
 			return addInput(pPath, buildArg);
 		}
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
index e4a5efa500f..6813635630f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildResource.java
@@ -61,6 +61,10 @@ public class BuildResource implements IBuildResource {
 	 * @see org.eclipse.cdt.managedbuilder.builddescription.IBuildResource#getLocation()
 	 */
 	public IPath getLocation() {
+		if(fFullWorkspacePath == null) {
+			return new Path(fLocationURI.getPath());
+		}
+
 		IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(fFullWorkspacePath);
 		if(resource == null) {
 			return new Path(fLocationURI.getPath());