Index: trunk/kernel/units/relationship/relationship_event_handler.php
===================================================================
diff -u -N -r5373 -r5431
--- trunk/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 5373)
+++ trunk/kernel/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 5431)
@@ -22,8 +22,7 @@
 		 */
 		function OnAddRelation(&$event)
 		{
-			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
-			$object =& $event->getObject();
+			$object =& $event->getObject( Array('skip_autoload' => true) );
 			
 			$table_info = $object->getLinkedInfo();
 			$main_item_type = $this->Application->getUnitOption($table_info['ParentPrefix'],'ItemType');