diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
index ca58a9a24f..fd51f12734 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
@@ -70,12 +70,12 @@
 	</Path>
 	
 	<Path name="/SharpDevelop/Dialogs/OptionsDialog">
-		<DialogPanel id    = "Profiling"
+		<OptionPanel id    = "Profiling"
 		             label = "${res:Dialog.Options.IDEOptions.Profiling}"
 		             insertbefore = "TextEditorOptions">
-			<DialogPanel id    = "General"
+			<OptionPanel id    = "General"
 			             label = "${res:Dialog.Options.IDEOptions.Profiling.General}"
 			             class = "ICSharpCode.Profiler.AddIn.OptionsPanels.General"/>
-		</DialogPanel>
+		</OptionPanel>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs
index e611f632dc..6d3bcbf3b0 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs
+++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs
@@ -23,6 +23,9 @@ namespace Hornung.ResourceToolkit.ToolTips
 	{
 		public void HandleToolTipRequest(ToolTipRequestEventArgs e)
 		{
+			if (!e.InDocument)
+				return;
+			
 			Location logicPos = e.LogicalPosition;
 			IDocument doc = e.Editor.Document;
 			if (logicPos.X > doc.GetLine(logicPos.Y).Length) {
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
index 07a6e14cd5..fa0851b491 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
@@ -295,6 +295,8 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		/// </summary>
 		internal static void HandleToolTipRequest(ToolTipRequestEventArgs e)
 		{
+			if (!e.InDocument)
+				return;
 			Location logicPos = e.LogicalPosition;
 			var doc = e.Editor.Document;
 			IExpressionFinder expressionFinder = ParserService.GetExpressionFinder(e.Editor.FileName);
diff --git a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
index 7247dbf972..2a9253c8d6 100644
--- a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
@@ -78,8 +78,10 @@ namespace ICSharpCode.Core.Presentation
 		internal static IList CreateMenuItems(UIElement inputBindingOwner, IEnumerable descriptors)
 		{
 			ArrayList result = new ArrayList();
-			foreach (MenuItemDescriptor descriptor in descriptors) {
-				result.Add(CreateMenuItemFromDescriptor(inputBindingOwner, descriptor));
+			if (descriptors != null) {
+				foreach (MenuItemDescriptor descriptor in descriptors) {
+					result.Add(CreateMenuItemFromDescriptor(inputBindingOwner, descriptor));
+				}
 			}
 			return result;
 		}