diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs b/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
index 86f9630dd8..e00f60b8d1 100644
--- a/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
@@ -43,6 +43,12 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 				c = bookmark.Class;
 			}
 			
+			ParserService.ParseCurrentViewContent();
+			c = c.ProjectContent.GetClass(c.FullyQualifiedName, c.TypeParameters.Count);
+			if (c == null) {
+				return new ToolStripMenuItem[0];
+			}
+			
 			LanguageProperties language = c.ProjectContent.Language;
 			
 			List<ToolStripItem> list = new List<ToolStripItem>();
diff --git a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
index c6e7400bf2..9b3f9a6246 100644
--- a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
+++ b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop
 {
 	public class SplashScreenForm : Form
 	{
-		public const string VersionText = "Serralongue build " + RevisionClass.Revision;
+		public const string VersionText = "SharpDevelop " + RevisionClass.FullVersion;
 		
 		static SplashScreenForm splashScreen;
 		static List<string> requestedFileList = new List<string>();