Index: TECH/Persistentie/Repository.cls.xml
===================================================================
diff -u -r2376 -r2382
--- TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 2376)
+++ TECH/Persistentie/Repository.cls.xml	(.../Repository.cls.xml)	(revision 2382)
@@ -35,8 +35,7 @@
 <FormalSpec>DataClassName:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	if (..#DataClassName = "")
-	{
+	if (..#DataClassName = "") {
 		Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("DataClassName moet gegeven worden bij het creeeren van een repository!") 
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
@@ -80,25 +79,18 @@
 <Private>1</Private>
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
-	#dim SQLTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
-	#dim SqlStatement As TECH.String = "SELECT ID FROM " _SQLTableName _" WHERE " _Filter
+	#dim SqlTableName As TECH.String = ##class(TECH.CompiledClassUtils).GetSQLTableName(..#DataClassName)
+	#dim SqlStatement As TECH.String = "SELECT ID FROM " _SqlTableName _" WHERE " _Filter
 
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(##class(TECH.DynamicQuery).%New(SqlStatement,Params))
-
-	#dim Result As TECH.Persistent = ""
-
-	#dim RecordCount = 0
-	while ResultSet.Next() {
-		Set Result = ..GeefViaID(ResultSet.GetData(1))
-		Set RecordCount = RecordCount +1
-		If RecordCount > 1 {
-			Do ##class(TECH.Exceptions.DataNotFoundException).Throw("geen unieke data gevonden voor " _..#DataClassName)
-		}
-	}
 	
-	Quit:(RecordCount=1) Result
-
-	Do ##class(TECH.Exceptions.DataNotFoundException).Throw("'geen data gevonden voor " _..#DataClassName)
+	if ResultSet.Next() {
+		#dim Result As TECH.Persistent = ..GeefViaID(ResultSet.GetData(1))	
+		do:ResultSet.Next() ##class(TECH.Exceptions.DataNotFoundException).Throw("Geen unieke data in '"_SqlTableName_"' gevonden met filter '"_Filter_"' en parameters '"_$$$LCVT(Params)_"'")
+	} else {
+		do ##class(TECH.Exceptions.DataNotFoundException).Throw("Geen data in '"_SqlTableName_"' gevonden met filter '"_Filter_"' en parameters '"_$$$LCVT(Params)_"'")
+	}
+	quit Result
 ]]></Implementation>
 </Method>
 </Class>