diff --git a/src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs b/src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs
index 9e472bdbc9..32faaec03a 100644
--- a/src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs
+++ b/src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs
@@ -42,6 +42,9 @@ namespace ICSharpCode.Profiler.Controller.Data
 		/// </summary>
 		public override NameMapping NameMapping {
 			get {
+				if (nameId == 0)
+					return new NameMapping(0, null, "Merged node", null);
+				
 				return this.provider.GetMapping(nameId);
 			}
 		}
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 1200a1a477..f4fc2b0de1 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
@@ -41,7 +41,7 @@
 			class="ICSharpCode.Profiler.AddIn.Commands.GoToDefinition" />
 		<MenuItem
 			id="SetAsRoot"
-			label="Set as root"
+			label="Set as root/Merge"
 			class="ICSharpCode.Profiler.AddIn.Commands.SetAsRoot" />
 		<MenuItem
 			id="FindCallsOfSelected"