Index: system/libraries/drivers/Database/Mysqli.php
===================================================================
--- system/libraries/drivers/Database/Mysqli.php	(revision 2687)
+++ system/libraries/drivers/Database/Mysqli.php	(working copy)
@@ -226,7 +226,7 @@
 		// autoloading is disabled to save a lot of stupid overhead.
 		if ($this->fetch_type == 'fetch_object')
 		{
-			$this->return_type = class_exists($type, FALSE) ? $type : 'stdClass';
+			$this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 		}
 		else
 		{
@@ -257,7 +257,7 @@
 
 				// NOTE - The class set by $type must be defined before fetching the result,
 				// autoloading is disabled to save a lot of stupid overhead.
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 			else
 			{
@@ -271,7 +271,7 @@
 
 			if ($fetch == 'fetch_object')
 			{
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 		}
 
Index: system/libraries/drivers/Database/Mssql.php
===================================================================
--- system/libraries/drivers/Database/Mssql.php	(revision 2687)
+++ system/libraries/drivers/Database/Mssql.php	(working copy)
@@ -392,7 +392,7 @@
 		// autoloading is disabled to save a lot of stupid overhead.
 		if ($this->fetch_type == 'mssql_fetch_object')
 		{
-			$this->return_type = class_exists($type, FALSE) ? $type : 'stdClass';
+			$this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 		}
 		else
 		{
@@ -423,7 +423,7 @@
 
 				// NOTE - The class set by $type must be defined before fetching the result,
 				// autoloading is disabled to save a lot of stupid overhead.
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 			else
 			{
@@ -437,7 +437,7 @@
 
 			if ($fetch == 'mssql_fetch_object')
 			{
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 		}
 
Index: system/libraries/drivers/Database/Pdosqlite.php
===================================================================
--- system/libraries/drivers/Database/Pdosqlite.php	(revision 2687)
+++ system/libraries/drivers/Database/Pdosqlite.php	(working copy)
@@ -385,7 +385,7 @@
 
 		if ($this->fetch_type == PDO::FETCH_OBJ)
 		{
-			$this->return_type = class_exists($type, FALSE) ? $type : 'stdClass';
+			$this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 		}
 		else
 		{
@@ -415,7 +415,7 @@
 
 				// NOTE - The class set by $type must be defined before fetching the result,
 				// autoloading is disabled to save a lot of stupid overhead.
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 			else
 			{
@@ -429,7 +429,7 @@
 
 			if ($fetch == PDO::FETCH_OBJ)
 			{
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 		}
 		try
Index: system/libraries/drivers/Database/Pgsql.php
===================================================================
--- system/libraries/drivers/Database/Pgsql.php	(revision 2687)
+++ system/libraries/drivers/Database/Pgsql.php	(working copy)
@@ -395,7 +395,7 @@
 		// autoloading is disabled to save a lot of stupid overhead.
 		if ($this->fetch_type == 'pg_fetch_object')
 		{
-			$this->return_type = class_exists($type, FALSE) ? $type : 'stdClass';
+			$this->return_type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 		}
 		else
 		{
@@ -426,7 +426,7 @@
 
 				// NOTE - The class set by $type must be defined before fetching the result,
 				// autoloading is disabled to save a lot of stupid overhead.
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 			else
 			{
@@ -440,7 +440,7 @@
 
 			if ($fetch == 'pg_fetch_object')
 			{
-				$type = class_exists($type, FALSE) ? $type : 'stdClass';
+				$type = (is_string($type) AND Kohana::auto_load($type)) ? $type : 'stdClass';
 			}
 		}