diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
index 26e6736081..f417084968 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs
@@ -552,6 +552,7 @@ namespace ICSharpCode.TextEditor
 		}
 		void DocumentFoldingsChanged(object sender, EventArgs e)
 		{
+			Caret.UpdateCaretPosition();
 			Invalidate();
 			this.motherTextAreaControl.AdjustScrollBars();
 		}
diff --git a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
index aa4d6d281d..1eeb475145 100644
--- a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
+++ b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
@@ -182,10 +182,7 @@ namespace ICSharpCode.Core
 		/// exe from the latest sdk.
 		/// </summary>
 		/// <param name="exeName">The EXE to search for.</param>
-		/// <returns>The path of the executable.</returns>
-		/// <exception cref="System.IO.FileNotFoundException">
-		/// Thrown if the exe is not found.
-		/// </exception>
+		/// <returns>The path of the executable, or null if the exe is not found.</returns>
 		public static string GetSdkPath(string exeName) {
 			string execPath;
 			if (!string.IsNullOrEmpty(WindowsSdk61InstallRoot)) {
@@ -204,7 +201,7 @@ namespace ICSharpCode.Core
 				execPath = Path.Combine(NetSdk20InstallRoot, "bin\\" + exeName);
 				if (File.Exists(execPath)) { return execPath; }
 			}
-			throw new FileNotFoundException(StringParser.Parse("${res:Fileutility.CantFindExecutableError}", new string[,] { {"EXECUTABLE",  exeName} }));
+			return null;
 		}
 		
 		/// <summary>