diff --git a/core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/standard/StandardBuildManager.java b/core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/standard/StandardBuildManager.java
index 6dc46993f61..a157aa56034 100644
--- a/core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/standard/StandardBuildManager.java
+++ b/core/org.eclipse.cdt.core/build/org/eclipse/cdt/core/build/standard/StandardBuildManager.java
@@ -53,7 +53,6 @@ public class StandardBuildManager implements IScannerInfoProvider {
 		try {
 			buildInfo = (IStandardBuildInfo)resource.getSessionProperty(buildInfoProperty);
 		} catch (CoreException e) {
-			return buildInfo;
 		}
 
 		// Try to load one for the project		
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
index b92011474c7..ca75f958b2f 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java
@@ -518,8 +518,8 @@ public class CCorePlugin extends Plugin {
 			projectHandle.open(monitor);
 
 			// Add C Nature ... does not add duplicates
-			CProjectNature.addCNature(projectHandle, new SubProgressMonitor(monitor, 1));
 			mapCProjectOwner(projectHandle, projectID, false);
+			CProjectNature.addCNature(projectHandle, new SubProgressMonitor(monitor, 1));
 		} finally {
 			//monitor.done();
 		}