diff --git a/lldb/examples/summaries/cocoa/NSSet.py b/lldb/examples/summaries/cocoa/NSSet.py
index b1f650534154..4abf703e1a99 100644
--- a/lldb/examples/summaries/cocoa/NSSet.py
+++ b/lldb/examples/summaries/cocoa/NSSet.py
@@ -189,7 +189,7 @@ def GetSummary_Impl(valobj):
 		wrapper = NSCountedSet_SummaryProvider(valobj, class_data.sys_params)
 		statistics.metric_hit('code_notrun',valobj)
 	else:
-		wrapper = NSSetUnknown_SummaryProvider(valobj)
+		wrapper = NSSetUnknown_SummaryProvider(valobj, class_data.sys_params)
 		statistics.metric_hit('unknown_class',str(valobj) + " seen as " + name_string)
 	return wrapper;
 
diff --git a/lldb/examples/summaries/cocoa/metrics.py b/lldb/examples/summaries/cocoa/metrics.py
index bf9a025d183c..99489e147e92 100644
--- a/lldb/examples/summaries/cocoa/metrics.py
+++ b/lldb/examples/summaries/cocoa/metrics.py
@@ -6,7 +6,11 @@ class Counter:
 		self.list = []
 	def update(self,name):
 		self.count = self.count + 1
-		self.list.append(str(name))
+		# avoid getting the full dump of this ValueObject just to save its metrics
+		if isinstance(name,lldb.SBValue):
+			self.list.append(name.GetName())
+		else:
+			self.list.append(str(name))
 	def __str__(self):
 		return str(self.count) + " times, for items [" + str(self.list) + "]"