Index: vhLib/WebServiceHelper.cls.xml
===================================================================
diff -u -r828 -r845
--- vhLib/WebServiceHelper.cls.xml	(.../WebServiceHelper.cls.xml)	(revision 828)
+++ vhLib/WebServiceHelper.cls.xml	(.../WebServiceHelper.cls.xml)	(revision 845)
@@ -32,7 +32,14 @@
 <FormalSpec><![CDATA[action:%String,requestBody:%CharacterStream,&responseBody:%CharacterStream,ClassName:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	Do ##class(vhLib.WebServiceLogger.LogService).LogStream(requestBody,"IN",ClassName)
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
+	Try {
+		#dim Personality as %String = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
+	}Catch{		
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1))
+		If Exception.GeefOmschrijving() = "Personality is niet opgezet."{
+			Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
+		}
+	}
 ]]></Implementation>
 </Method>
 </Class>