diff --git a/src/Main/Base/Project/Src/Project/Solution/Solution.cs b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
index 46357312dc..d0525b2fda 100644
--- a/src/Main/Base/Project/Src/Project/Solution/Solution.cs
+++ b/src/Main/Base/Project/Src/Project/Solution/Solution.cs
@@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.Project
 	{
 		public const int SolutionVersionVS2005 = 9;
 		public const int SolutionVersionVS2008 = 10;
+		public const int SolutionVersionVS2010 = 11;
 		
 		/// <summary>contains &lt;GUID, (IProject/ISolutionFolder)&gt; pairs.</summary>
 		Dictionary<string, ISolutionFolder> guidDictionary = new Dictionary<string, ISolutionFolder>();
@@ -368,6 +369,8 @@ namespace ICSharpCode.SharpDevelop.Project
 					sw.WriteLine("# Visual Studio 2005");
 				} else if (versionNumber == SolutionVersionVS2008) {
 					sw.WriteLine("# Visual Studio 2008");
+				} else if (versionNumber == SolutionVersionVS2010) {
+					sw.WriteLine("# Visual Studio 10");
 				}
 				sw.WriteLine("# SharpDevelop " + RevisionClass.FullVersion);
 				sw.Write(projectSection.ToString());
@@ -480,6 +483,7 @@ namespace ICSharpCode.SharpDevelop.Project
 						break;
 					case "9.00":
 					case "10.00":
+					case "11.00":
 						break;
 					default:
 						MessageService.ShowErrorFormatted("${res:SharpDevelop.Solution.UnknownSolutionVersion}", match.Result("${Version}"));
diff --git a/src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs b/src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs
index a02358f82d..b711d7fad0 100644
--- a/src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs
+++ b/src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop
 		public IAsyncResult BeginInvoke(Delegate method, object[] args)
 		{
 			DispatcherOperation op;
-			if (args.Length == 0)
+			if (args == null || args.Length == 0)
 				op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method);
 			else if (args.Length == 1)
 				op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method, args[0]);