Index: AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml
===================================================================
diff -u -r38397 -r38398
--- AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 38397)
+++ AXimpl/BizTalkMessage/Converter/GeolocationUpsertConverter.cls.xml	(.../GeolocationUpsertConverter.cls.xml)	(revision 38398)
@@ -9,6 +9,10 @@
 <Implementation><![CDATA[
 	Set Agenda = ##class(Derde.Agenda.Agenda).%OpenId(Command.SubjectId)
 	
+	If $$$Not(..IsGeldig(Agenda)) {
+		Do ##class(TECH.Exceptions).Throw(##class(TECH.Exceptions.NothingToConvertException).%New("Voor Id '"_Command.SubjectId_"' valt er niets te converteren"))
+	}
+	
 	Set Location=##class(AXBizTalk.Crm.Geolocation.Location).%New()
 	Do Location.Fill(Agenda)
 	
@@ -18,6 +22,17 @@
 	Quit MessageParts
 ]]></Implementation>
 </Method>
+
+<Method name="IsGeldig">
+<FormalSpec>Agenda:Derde.Agenda.Agenda</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Quit:'Agenda.AutoCreate 0
+	
+	Quit 1
+]]></Implementation>
+</Method>
 </Class>