Index: TECH/enu/ExceptionCode.cls.xml
===================================================================
diff -u -r2333 -r2372
--- TECH/enu/ExceptionCode.cls.xml	(.../ExceptionCode.cls.xml)	(revision 2333)
+++ TECH/enu/ExceptionCode.cls.xml	(.../ExceptionCode.cls.xml)	(revision 2372)
@@ -6,7 +6,7 @@
 <Super>%String</Super>
 
 <Parameter name="VALUELIST">
-<Default>;-1000;-1001;-1002;-1003;-1004;-1005;-1006;1005:InvalidUserInput;-1008;-1009;-1010;-1011;-1012;-1013;-1014;-1015;-1016;-1017;-1018;-1019;-1020;-3000;-3001;-5000;-5005;-5804;-4000;-6001;-6002;-7001</Default>
+<Default>;-1000;-1001;-1002;-1003;-1004;-1005;-1006;1005:InvalidUserInput;-1008;-1009;-1010;-1011;-1012;-1013;-1014;-1015;-1016;-1017;-1018;-1019;-1020;-1021;-3000;-3001;-5000;-5005;-5804;-4000;-6001;-6002;-7001</Default>
 </Parameter>
 
 <Method name="GeneralError">
@@ -156,6 +156,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="DataNotFound">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.enu.ExceptionCode</ReturnType>
+<Implementation><![CDATA[	Quit "-1021"
+]]></Implementation>
+</Method>
+
 <Method name="ObjectValidationFailed">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.enu.ExceptionCode</ReturnType>
Index: TECH/Exceptions/DataNotFoundException.cls.xml
===================================================================
diff -u
--- TECH/Exceptions/DataNotFoundException.cls.xml	(revision 0)
+++ TECH/Exceptions/DataNotFoundException.cls.xml	(revision 2372)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Exceptions.DataNotFoundException">
+<Super>TECH.Exceptions.AbstractOmschrijvingException</Super>
+
+<Method name="GeefExceptionCode">
+<ReturnType>TECH.enu.ExceptionCode</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.enu.ExceptionCode).DataNotFound()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
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>