Index: branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php
===================================================================
diff -u -r6673 -r6826
--- branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6673)
+++ branches/unlabeled/unlabeled-1.65.4/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 6826)
@@ -522,6 +522,11 @@
 		$parser =& $this->Application->Parser;
 		$this->Application->Parser =& $BlockParser;
 
+		// this is for the parser to know the master template in case an error occurs,
+		// ParseTemplate will reset it anyway, but this will allow error handler to display the tempalte
+		// which tries to include missing template for example
+		$this->Application->Parser->TemplateName = $parser->TemplateName;
+
 		$t = $this->SelectParam($params, 't,template,block,name');
 		$t = eregi_replace("\.tpl$", '', $t);