diff --git a/lib/Doctrine/ORM/EntityNotFoundException.php b/lib/Doctrine/ORM/EntityNotFoundException.php
index 7062112fc..e4ace3dc0 100644
--- a/lib/Doctrine/ORM/EntityNotFoundException.php
+++ b/lib/Doctrine/ORM/EntityNotFoundException.php
@@ -28,13 +28,16 @@ namespace Doctrine\ORM;
 class EntityNotFoundException extends ORMException
 {
     /**
-     * Constructor.
+     * Static constructor.
      *
      * @param string   $className
      * @param string[] $id
+     *
+     * @return self
      */
-    public function __construct($className, array $id = array())
+    public static function fromClassNameAndIdentifier($className, array $id)
     {
+
         $ids = array();
 
         foreach ($id as $key => $value) {
@@ -42,7 +45,7 @@ class EntityNotFoundException extends ORMException
         }
 
 
-        parent::__construct(
+        return new self(
             'Entity of type \'' . $className . '\'' . ($ids ? ' for IDs ' . implode(', ', $ids) : '') . ' was not found'
         );
     }
diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
index 5ecd883cf..157ae643f 100644
--- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php
+++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -154,7 +154,7 @@ class ProxyFactory extends AbstractProxyFactory
                     $proxy->__setCloner($cloner);
                     $proxy->__setInitialized(false);
 
-                    throw new EntityNotFoundException(
+                    throw EntityNotFoundException::fromClassNameAndIdentifier(
                         $classMetadata->getName(),
                         $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
                     );
@@ -190,7 +190,7 @@ class ProxyFactory extends AbstractProxyFactory
                 $proxy->__setCloner($cloner);
                 $proxy->__setInitialized(false);
 
-                throw new EntityNotFoundException(
+                throw EntityNotFoundException::fromClassNameAndIdentifier(
                     $classMetadata->getName(),
                     $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
                 );
@@ -225,7 +225,7 @@ class ProxyFactory extends AbstractProxyFactory
             $original   = $entityPersister->loadById($identifier);
 
             if (null === $original) {
-                throw new EntityNotFoundException(
+                throw EntityNotFoundException::fromClassNameAndIdentifier(
                     $classMetadata->getName(),
                     $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
                 );
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index c1e3dd1ac..e91ff3d12 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1843,7 +1843,10 @@ class UnitOfWork implements PropertyChangedListener
                     // If the identifier is ASSIGNED, it is NEW, otherwise an error
                     // since the managed entity was not found.
                     if ( ! $class->isIdentifierNatural()) {
-                        throw new EntityNotFoundException($class->getName(), $this->identifierFlattener->flattenIdentifier($class, $id));
+                        throw EntityNotFoundException::fromClassNameAndIdentifier(
+                            $class->getName(),
+                            $this->identifierFlattener->flattenIdentifier($class, $id)
+                        );
                     }
 
                     $managedCopy = $this->newInstance($class);