Index: branches/unlabeled/unlabeled-1.82.2/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r7828 -r7837
--- branches/unlabeled/unlabeled-1.82.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7828)
+++ branches/unlabeled/unlabeled-1.82.2/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 7837)
@@ -1782,6 +1782,10 @@
 		 */
 		function OnCreateCustomFields(&$event)
 		{
+			if (defined('IS_INSTALL') && IS_INSTALL && !$this->Application->TableFound('CustomField')) {
+				return false;
+			}
+		
 			$main_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
 			if (!$main_prefix) return false;
 			$item_type = $this->Application->getUnitOption($main_prefix, 'ItemType');