Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -N -r13987 -r14133
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13987)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 14133)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13987 2010-10-19 08:57:53Z alex $
+* @version	$Id: application.php 14133 2011-01-09 14:45:36Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2786,6 +2786,46 @@
 	}
 
 	/**
+	 * Prints trace, when debug mode is not available
+	 *
+	 * @param bool $return_result
+	 * @param int $skip_levels
+	 * @return string
+	 */
+	function printTrace($return_result = false, $skip_levels = 1)
+	{
+		$ret = Array ();
+		$trace = debug_backtrace(false);
+
+		for ($i = 0; $i < $skip_levels; $i++) {
+			array_shift($trace);
+		}
+
+		foreach ($trace as $level => $trace_info) {
+        	if ( isset($trace_info['class']) ) {
+				$object = $trace_info['class'];
+			}
+			elseif ( isset($trace_info['object']) ) {
+				$object = get_class( $trace_info['object'] );
+			}
+			else {
+				$object = '';
+			}
+
+			$type = isset($trace_info['type']) ? $trace_info['type'] : '';
+
+			// implode(', ', $trace_info['args'])
+			$ret[] = '#' . $level . '  ' . $object . $type . $trace_info['function'].'(...) called at [' . $trace_info['file'] . ':' . $trace_info['line'] . ']';
+		}
+
+		if ($return_result) {
+			return implode("\n", $ret);
+		}
+
+		echo implode("\n", $ret);
+	}
+
+	/**
 	 * Returns & blocks next ResourceId available in system
 	 *
 	 * @return int
Index: branches/5.1.x/core/kernel/utility/factory.php
===================================================================
diff -u -N -r13086 -r14133
--- branches/5.1.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 13086)
+++ branches/5.1.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 14133)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: factory.php 13086 2010-01-12 19:47:40Z alex $
+* @version	$Id: factory.php 14133 2011-01-09 14:45:36Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -209,11 +209,11 @@
 		 * @param string $real_class
 		 * @access private
 		 */
-		function includeClassFile($real_class)
+		function includeClassFile($real_class, $pseudo_class = null)
 		{
 			if (class_exists($real_class)) return;
 			if(!isset($this->Files[$real_class])) {
-				trigger_error('Real Class <b>'.$real_class.'</b> is not registered with the Factory', E_USER_ERROR);
+				trigger_error('Real Class <b>'.$real_class.'</b> (for pseudo class <b>' . $pseudo_class . '</b>) is not registered with the Factory', E_USER_ERROR);
 			}
 			if(!file_exists(FULL_PATH.$this->Files[$real_class])) {
 				if ($this->Application->isDebugMode()) {
@@ -227,7 +227,7 @@
 			{
 				foreach($this->Dependencies[$real_class] as $dep_class_name)
 				{
-					$this->includeClassFile($dep_class_name);
+					$this->includeClassFile($dep_class_name, $pseudo_class);
 				}
 			}
 
@@ -248,7 +248,7 @@
 		function &makeClass($pseudo_class)
 		{
 			$real_class = $this->realClasses[$pseudo_class];
-			if (!class_exists($real_class)) $this->includeClassFile($real_class);
+			if (!class_exists($real_class)) $this->includeClassFile($real_class, $pseudo_class);
 
 			$mem_before = memory_get_usage();
 			$time_before = getmicrotime();