diff --git a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
index c9ff7d56f5..d6f7306341 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
@@ -121,6 +121,8 @@ namespace ICSharpCode.AddInManager
 		
 		string GetLink(string text)
 		{
+			if (text == null)
+				return null;
 			switch (text) {
 				case "GNU General Public License":
 				case "GPL":
diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
index a0f795a36d..48058dc6de 100644
--- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
@@ -593,12 +593,18 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 				newSolution.fileName = Path.ChangeExtension(fileName, ".sln");
 				ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertSolution(newSolution, fileName);
+				if (newSolution.FixSolutionConfiguration(newSolution.Projects)) {
+					newSolution.Save();
+				}
 			} else if (extension == ".PRJX") {
 				if (!MessageService.AskQuestion("${res:SharpDevelop.Solution.ImportPrjx}")) {
 					return null;
 				}
 				newSolution.fileName = Path.ChangeExtension(fileName, ".sln");
 				ICSharpCode.SharpDevelop.Project.Converter.CombineToSolution.ConvertProject(newSolution, fileName);
+				if (newSolution.FixSolutionConfiguration(newSolution.Projects)) {
+					newSolution.Save();
+				}
 			} else {
 				newSolution.fileName = fileName;
 				if (!SetupSolution(newSolution, fileName)) {