Index: branches/RC/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r11685 -r11724
--- branches/RC/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 11685)
+++ branches/RC/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 11724)
@@ -84,8 +84,8 @@
 		{
 			$prefix = $this->_getSourcePrefix($event);
 
-			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields');
-			$custom_fields = $this->Application->getUnitOption($prefix, 'CustomFields');
+			$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array ());
+			$custom_fields = $this->Application->getUnitOption($prefix, 'CustomFields', Array ());
 
 			$hidden_fields = Array ();
 			foreach ($custom_fields as $custom_field) {