diff --git a/lib/Doctrine/Common/Exceptions/DoctrineException.php b/lib/Doctrine/Common/Exceptions/DoctrineException.php
new file mode 100644
index 000000000..4a331dbff
--- /dev/null
+++ b/lib/Doctrine/Common/Exceptions/DoctrineException.php
@@ -0,0 +1,24 @@
+<?php
+
+class Doctrine_Common_Exceptions_DoctrineException extends Exception
+{
+    private $_innerException;
+    
+    public function __construct($message = "", Exception $innerException = null)
+    {
+        parent::__construct($message);
+        $this->_innerException = $innerException;
+    }
+    
+    public function getInnerException()
+    {
+        return $this->_innerException;
+    }
+    
+    public static function notImplemented($method, $class)
+    {
+        return new self("The method '$method' is not implemented in the class '$class'.");
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Exceptions/ORMException.php b/lib/Doctrine/ORM/Exceptions/ORMException.php
index e3f43aeba..99e6db428 100644
--- a/lib/Doctrine/ORM/Exceptions/ORMException.php
+++ b/lib/Doctrine/ORM/Exceptions/ORMException.php
@@ -33,7 +33,7 @@
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Roman Borschel <roman@code-factory.org>
  */
-class Doctrine_ORM_Exceptions_ORMException extends Doctrine_Shared_Exceptions_DoctrineException
+class Doctrine_ORM_Exceptions_ORMException extends Doctrine_Common_Exceptions_DoctrineException
 {
 
 }