Index: TECH/Persistentie/Repository.cls.xml
===================================================================
diff -u -r2370 -r2372
--- TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 2370)
+++ TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 2372)
@@ -88,10 +88,16 @@
 	#dim ResultSetIterator As TECH.ResultSetIterator = ##class(TECH.ResultSetIterator).%New(ResultSet)
 	
 	#dim Result As TECH.Persistent = ""
+	
 	Set:ResultSetIterator.HasNext() Result = $classMethod(..#DataClassName,"%OpenId",ResultSetIterator.Next().Data("ID"))
-	Quit:('ResultSetIterator.HasNext()) Result
-
-	// Throw exception more then one item found !!!
+	
+	if ResultSetIterator.HasNext() {
+		Do ##class(TECH.Exceptions.DataNotFoundException).Throw("geen unieke data gevonden voor " _..#DataClassName)
+	} ElseIf Result="" {
+		Do ##class(TECH.Exceptions.DataNotFoundException).Throw("'geen data gevonden voor " _..#DataClassName)
+	}
+	
+	Quit Result
 ]]></Implementation>
 </Method>
 </Class>