diff --git a/Doctrine.php b/Doctrine.php
index a4c0450f7..20bf05439 100644
--- a/Doctrine.php
+++ b/Doctrine.php
@@ -225,8 +225,9 @@ final class Doctrine {
     public static function loadAll() {
         if(! self::$path)
             self::$path = dirname(__FILE__);
-            
-        $dir = dir(self::$path);
+
+        $path = self::$path.DIRECTORY_SEPARATOR."Doctrine";
+        $dir = dir($path);
         $a   = array();
         while (false !== ($entry = $dir->read())) {
             switch($entry):
@@ -243,11 +244,11 @@ final class Doctrine {
                 case "DQL":
                 case "Sensei":
                 case "Iterator":
-                    $a[]  = self::$path.DIRECTORY_SEPARATOR.$entry;
+                    $a[]  = $path.DIRECTORY_SEPARATOR.$entry;
                 break;
                 default:
-                    if(is_file(self::$path.DIRECTORY_SEPARATOR.$entry) && substr($entry,-4) == ".php") {
-                        require_once($entry);
+                    if(is_file($path.DIRECTORY_SEPARATOR.$entry) && substr($entry,-4) == ".php") {
+                        require_once($path.DIRECTORY_SEPARATOR.$entry);
                     }
             endswitch;
         }
diff --git a/Doctrine/Exception/Naming.class.php b/Doctrine/Exception/Naming.class.php
index a26fce4dd..70a691c42 100644
--- a/Doctrine/Exception/Naming.class.php
+++ b/Doctrine/Exception/Naming.class.php
@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user defined Doctrine_Table is badly named
  */
diff --git a/Doctrine/Record/Exception.php b/Doctrine/Record/Exception.php
index 46ede34cd..37eed6fe0 100644
--- a/Doctrine/Record/Exception.php
+++ b/Doctrine/Record/Exception.php
@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when Doctrine_Record is refreshed and the refreshed primary key doens't match the old one
  */
diff --git a/Doctrine/Session/Exception.php b/Doctrine/Session/Exception.php
index b8b42966e..3d7c2fdb0 100644
--- a/Doctrine/Session/Exception.php
+++ b/Doctrine/Session/Exception.php
@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user tries to get the current 
  * session and there are no open sessions
diff --git a/Doctrine/Table/Exception.php b/Doctrine/Table/Exception.php
index aa7d06556..b5bc52180 100644
--- a/Doctrine/Table/Exception.php
+++ b/Doctrine/Table/Exception.php
@@ -1,5 +1,5 @@
 <?php
-require_once(Doctrine::getPath().DIRECTORY_SEPARATOR."Exception.php");
+Doctrine::autoload('Doctrine_Exception');
 /**
  * thrown when user tries to initialize a new instance of Doctrine_Table, 
  * while there already exists an instance of that table