Index: Derde/Agenda/Agenda.cls.xml
===================================================================
diff -u -r2164 -r2190
--- Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2164)
+++ Derde/Agenda/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2190)
@@ -524,13 +524,11 @@
 	    if scStoreEindgebruiker do Agenda.EindgebruikerSetObjectId(pxAgenda.Eindgebruiker.ID) 
 	}
 	
-	if $length($$StripEnd(pxAgenda.Architect)) {
+	do Agenda.ArchitectSetObjectId("")
+	if $isObject(pxAgenda.Architect) && $length($$StripEnd(pxAgenda.Architect.ID)) && (pxAgenda.Architect.ID '=  0) {
 		do Agenda.ArchitectSetObjectId(pxAgenda.Architect.ID)
 	}
-	else {
-		do Agenda.ArchitectSetObjectId("")
-	}
-
+	
     set Agenda.OngekendeArchitectNaam = pxAgenda.OngekendeArchitectNaam
 	
 StripEnd(String)