Index: branches/5.1.x/units/sections/section_eh.php =================================================================== diff -u -N -r13558 -r13873 --- branches/5.1.x/units/sections/section_eh.php (.../section_eh.php) (revision 13558) +++ branches/5.1.x/units/sections/section_eh.php (.../section_eh.php) (revision 13873) @@ -1,6 +1,6 @@ Application->setUnitOption($event->MasterEvent->Prefix, 'Grids', $grids); - if (!$this->Application->isAdmin) { + if (!$this->Application->isAdmin && is_object($this->Application->siteDomain)) { // re-configure object, because it's recalled before kUnitConfigReader::AfterConfigRead is called $this->Application->siteDomain->defineFields(); }