Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -r3229 -r3236
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3229)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3236)
@@ -454,7 +454,7 @@
 				// 2. return error template then
 				$template_found = true;
 				$template_path = $this->Application->ConfigValue('ErrorTemplate');
-				if(!$template_path) $template_path = 'error_template';
+				if(!$template_path) $template_path = 'error_notfound';
 			}
 		}
 		
@@ -472,6 +472,12 @@
 			$this->Application->HandleEvent($module_event);
 			$item_id = $this->Get($module_prefix.'_id');
 			$module_params = Array($module_prefix.'_id' => $item_id ? $item_id : '0' );
+			
+			if($module_event->status == erFAIL)
+			{
+				$not_found = $this->Application->ConfigValue('ErrorTemplate');
+				$this->Set('t', $not_found ? $not_found : 'error_notfound' );
+			}
 		}
 
 		$this->finalizeParsing($passed, $module_params);