diff --git a/lib/Doctrine/ORM/Proxy/ProxyException.php b/lib/Doctrine/ORM/Proxy/ProxyException.php
index 0531f2fb0..892dbebbb 100644
--- a/lib/Doctrine/ORM/Proxy/ProxyException.php
+++ b/lib/Doctrine/ORM/Proxy/ProxyException.php
@@ -1,8 +1,36 @@
 <?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+*/
 
 namespace Doctrine\ORM\Proxy;
 
-class ProxyException extends Doctrine\ORM\ORMException {
+/**
+ * ORM Proxy Exception
+ *
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.doctrine-project.com
+ * @since       1.0
+ * @version     $Revision$
+ * @author      Benjamin Eberlei <kontakt@beberlei.de>
+ */
+class ProxyException extends \Doctrine\ORM\ORMException {
 
     public static function proxyDirectoryRequired() {
         return new self("You must configure a proxy directory. See docs for details");
diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
index c0e8ac601..9445af133 100644
--- a/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyClassGeneratorTest.php
@@ -141,6 +141,18 @@ class ProxyClassGeneratorTest extends \Doctrine\Tests\OrmTestCase
 
         $this->assertEquals(1, substr_count($classCode, 'function __sleep'));
     }
+
+    public function testNoConfigDir_ThrowsException()
+    {
+        $this->setExpectedException('Doctrine\ORM\Proxy\ProxyException');
+        new ProxyFactory($this->_getTestEntityManager(), null, null);
+    }
+
+    public function testNoNamespace_ThrowsException()
+    {
+        $this->setExpectedException('Doctrine\ORM\Proxy\ProxyException');
+        new ProxyFactory($this->_getTestEntityManager(), __DIR__ . '/generated', null);
+    }
     
     protected function _getMockPersister()
     {