Index: branches/5.2.x/core/kernel/utility/factory.php
===================================================================
diff -u -N -r14428 -r14572
--- branches/5.2.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 14428)
+++ branches/5.2.x/core/kernel/utility/factory.php	(.../factory.php)	(revision 14572)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: factory.php 14428 2011-07-05 16:31:44Z alex $
+* @version	$Id: factory.php 14572 2011-09-20 15:25:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -180,14 +180,14 @@
 		 * @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]) ) {
-				throw new Exception('Real Class <strong>' . $real_class . '</strong> is not registered with the Factory');
+				throw new Exception('Real Class <strong>' . $real_class . '</strong> (for pseudo class <strong>' . $pseudo_class . '</strong>) is not registered with the Factory');
 			}
 
 			if( !file_exists(FULL_PATH . $this->Files[$real_class]) ) {
@@ -198,7 +198,7 @@
 			{
 				foreach($this->Dependencies[$real_class] as $dep_class_name)
 				{
-					$this->includeClassFile($dep_class_name);
+					$this->includeClassFile($dep_class_name, $pseudo_class);
 				}
 			}
 
@@ -224,7 +224,7 @@
 			$real_class = $this->realClasses[$pseudo_class];
 
 			if ( !class_exists($real_class) ) {
-				$this->includeClassFile($real_class);
+				$this->includeClassFile($real_class, $pseudo_class);
 			}
 
 			$mem_before = memory_get_usage();