Index: branches/5.2.x/core/kernel/managers/rewrite_url_processor.php
===================================================================
diff -u -N -r16339 -r16348
--- branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/managers/rewrite_url_processor.php	(.../rewrite_url_processor.php)	(revision 16348)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rewrite_url_processor.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: rewrite_url_processor.php 16348 2016-07-10 19:41:11Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -152,6 +152,9 @@
 				// don't cache 404 Not Found
 				$this->_setCachedUrl($url, Array ('vars' => $vars, 'passed' => $passed));
 			}
+			else {
+				header('HTTP/1.0 404 Not Found');
+			}
 
 			if ( $this->Application->GetVarDirect('t', 'Post') ) {
 				// template from POST overrides template from URL.
@@ -445,7 +448,13 @@
 		}
 
 		if ( $this->_partsToParse ) {
-			$vars = array_merge($vars, $this->manager->prepare404($vars['m_theme']));
+			/** @var kThemesHelper $themes_helper */
+			$themes_helper = $this->Application->recallObject('ThemesHelper');
+
+			$not_found = $this->Application->ConfigValue('ErrorTemplate');
+			$vars['t'] = $not_found ? $not_found : 'error_notfound';
+			$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $vars['m_theme']);
+			$vars['pass'] = array('m');
 		}
 
 		return $vars;
@@ -1078,4 +1087,4 @@
 
 		return $ret;
 	}
-}
\ No newline at end of file
+}