Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -r10786 -r10796
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 10786)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 10796)
@@ -2331,19 +2331,8 @@
 	{
 		$object =& $event->getObject();
 		if (!$object->isLoaded()) {
-			if (!$this->Application->IsAdmin() && ($object->Prefix != 'cms')) {
-				// category item not loaded on Front-End -> it's not found in database
-				header('HTTP/1.0 404 Not Found');
-
-				while (ob_get_level()) {
-					ob_end_clean();
-				}
-
-				// object is used inside template parsing, so break out any parsing and return error document
-				$error_template = $this->Application->ConfigValue('ErrorTemplate');
-				$this->Application->HTML = $this->Application->ParseBlock( Array ('name' => $error_template) );
-				$this->Application->Done();
-				exit;
+			if ($object->Prefix != 'cms') {
+				$this->_errorNotFound($event);
 			}
 
 			return true;