Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r51267 -r51275
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 51267)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 51275)
@@ -24,18 +24,23 @@
 <FormalSpec>OorsprongKettingString:%String</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
-	#dim Personality As DOM.common.Personality
+	Quit:OorsprongKettingString="" ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+	
 	Try {	
 		Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
 		Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
 		
 		#dim OorsprongKetting As %List = ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
 		
 		#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting,1),",",1)
-		Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
+		If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
+			Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+		}
+		#dim Personality As DOM.common.Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+		Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
+		Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 	}
 	
 	Quit Personality
Index: vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r51260 -r51275
--- vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 51260)
+++ vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 51275)
@@ -3,14 +3,28 @@
 <Class name="vhUnitTest.DOM.VKP.impl.EindPersonalityBepaler.GeefEindPersonality.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test: Ketting met crappy data">
+<Method name="Test: Ketting met crappy data -&gt; exceptie">
 <Implementation><![CDATA[
 	#dim Ketting As %String = $$$DummyString
 	
-	Do $$$AssertEquals(..VoerUit(Ketting).GeefID(), ##class(DOM.common.enu.Personality).VanHoecke())
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon object van type DOM.common.impl.Personality niet openen met id 'NIET VAN TOEPASSING'")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.BaseException",Substrings))
+
+	Do ..VoerUit(Ketting)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Ketting met onbekende personality -&gt; exception">
+<Implementation><![CDATA[
+	#dim Ketting As %String = "((42, ""K||7833"", 255025))"
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Kon object van type DOM.common.impl.Personality niet openen met id '42'")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.BaseException",Substrings))
+
+	Do ..VoerUit(Ketting)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Ketting met 0 items">
 <Implementation><![CDATA[
 	#dim Ketting As %String = "()"
@@ -19,6 +33,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Helemaal lege ketting">
+<Implementation><![CDATA[
+	#dim Ketting As %String = ""
+	
+	Do $$$AssertEquals(..VoerUit(Ketting).GeefID(), ##class(DOM.common.enu.Personality).VanHoecke())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Ketting met 1 items (bv Van Hoecke)">
 <Implementation><![CDATA[
 	#dim Ketting As %String = "((1, ""K||7833"", 255025))"