diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
index bdccea7cd26..d60c832c8c4 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
@@ -103,7 +103,12 @@ public class ConfigurationModification extends FolderInfoModification implements
 
 	@Override
 	public CompatibilityStatus getBuilderCompatibilityStatus() {
-		return getCurrentBuilderCompatibilityInfo().getCompatibilityStatus();
+		BuilderCompatibilityInfoElement currentBuilderCompatibilityInfo = getCurrentBuilderCompatibilityInfo();
+		if (currentBuilderCompatibilityInfo == null) {
+			return new CompatibilityStatus(IStatus.ERROR, Messages.getString("ConfigurationModification.0"), null); //$NON-NLS-1$
+		}
+
+		return currentBuilderCompatibilityInfo.getCompatibilityStatus();
 	}
 
 	private ConflictMatchSet getParentConflictMatchSet(){
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
index e803fc869b3..b5aabd8e6ae 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
@@ -1092,7 +1092,7 @@
             targetTool="cdt.managedbuild.tool.llvm.archiver">
          <builder
                id="cdt.managedbuild.target.llvm.builder.base"
-               isAbstract="true"
+               isAbstract="false"
                superClass="org.eclipse.cdt.build.core.internal.builder">
          </builder>
          <tool