Index: TECH/ListUtils.cls.xml
===================================================================
diff -u -r1789 -r1896
--- TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1789)
+++ TECH/ListUtils.cls.xml	(.../ListUtils.cls.xml)	(revision 1896)
@@ -420,33 +420,15 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>List:%ListOfObjects,Property:%String,Value:%String=""</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim Exists = 0
-	
-	set itList = ##class(TECH.ListIterator).%New(List)
-	while (itList.HasNext()) && ('Exists) {
-		#dim Object As %RegisteredObject = itList.Next()
-		set Exists = ($zobjProperty(Object,Property)=Value)
-	}
-	
-	quit Exists
+<Implementation><![CDATA[	quit $IsObject(##class(TECH.ObjectListUtils).FindPropertyWithValue(List, Property, Value))
 ]]></Implementation>
 </Method>
 
 <Method name="ExistsGetMethodWithValue">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>List:%ListOfObjects,GetMethod:%String,Value:%String=""</FormalSpec>
+<FormalSpec>List:%ListOfObjects,Method:%String,Value:%String=""</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim Exists = 0
-	
-	set itList = ##class(TECH.ListIterator).%New(List)
-	while (itList.HasNext()) && ('Exists) {
-		#dim Object As %RegisteredObject = itList.Next()
-		set Exists = ($zobjMethod(Object,GetMethod)=Value)
-	}
-	
-	quit Exists
+<Implementation><![CDATA[	quit $IsObject(##class(TECH.ObjectListUtils).FindMethodWithValue(List, Method, Value))
 ]]></Implementation>
 </Method>
 
Index: TECH/ObjectListUtils.cls.xml
===================================================================
diff -u -r1884 -r1896
--- TECH/ObjectListUtils.cls.xml	(.../ObjectListUtils.cls.xml)	(revision 1884)
+++ TECH/ObjectListUtils.cls.xml	(.../ObjectListUtils.cls.xml)	(revision 1896)
@@ -62,6 +62,41 @@
 	quit Removed
 ]]></Implementation>
 </Method>
+
+<Method name="FindPropertyWithValue">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>List:%ListOfObjects,Property:%String,Value:%String=""</FormalSpec>
+<ReturnType>%Base</ReturnType>
+<Implementation><![CDATA[
+	#dim FoundObject As %Base = ""
+	set itList = ##class(TECH.ListIterator).%New(List)
+	while (itList.HasNext()) && $$$Not($IsObject(FoundObject)) {
+		#dim Object As %RegisteredObject = itList.Next()
+		If ($Property(Object,Property)=Value) {
+			set FoundObject = Object
+		}
+	}
+	quit FoundObject
+]]></Implementation>
+</Method>
+
+<Method name="FindMethodWithValue">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>List:%ListOfObjects,Method:%String,Value:%String=""</FormalSpec>
+<ReturnType>%Base</ReturnType>
+<Implementation><![CDATA[
+	#dim FoundObject As %Base = ""
+	
+	set itList = ##class(TECH.ListIterator).%New(List)
+	while (itList.HasNext()) && $$$Not($IsObject(FoundObject)) {
+		#dim Object As %RegisteredObject = itList.Next()
+		If ($Method(Object,Method)=Value) {
+			set FoundObject = Object
+		}
+	}
+	quit FoundObject
+]]></Implementation>
+</Method>
 </Class>