diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/MBSLanguageSettingsProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/MBSLanguageSettingsProvider.java
index f324c2a6fc8..230a950c250 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/MBSLanguageSettingsProvider.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/MBSLanguageSettingsProvider.java
@@ -135,8 +135,7 @@ public class MBSLanguageSettingsProvider extends AbstractExecutableExtensionBase
 			}
 			@Override
 			public LanguageSettingsStorage clone() throws CloneNotSupportedException {
-				throw new CloneNotSupportedException();
-//				return this;
+				return this;
 			}
 			@Override
 			public boolean equals(Object obj) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
index e848b5e4341..6d590040fcb 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
@@ -212,7 +212,6 @@ public class Messages extends NLS {
 	public static String PropertyPageDefsTab_9;
 	public static String PropertyPageDefsTab_showIncludeFileTab;
 	public static String PropertyPageDefsTab_showProvidersTab;
-	public static String RefreshPolicyExceptionDialog_addButtonLabel;
 	public static String RefreshPolicyExceptionDialog_addDialogLabel;
 	public static String RefreshPolicyExceptionDialog_AddExceptionInfoDialog_message;
 	public static String RefreshPolicyExceptionDialog_AddExceptionInfoDialog_title;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
index 773244bc9ae..064a72b184f 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
@@ -199,7 +199,7 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
 				LanguageSettingsStorage clone = base.lspPersistedState.get(providerId).clone();
 				lspPersistedState.put(providerId, clone);
 			} catch (CloneNotSupportedException e) {
-				CCorePlugin.log(e);
+				CCorePlugin.log("Not able to clone language settings storage:" + e); //$NON-NLS-1$
 			}
 		}
 	}