diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
index cb5037679..adb0cd529 100644
--- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php
+++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php
@@ -65,7 +65,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . 
+            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -154,7 +154,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("A detached entity was found during " . $operation . " " . self::objToStr($entity));
+        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
     }
 
     /**
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 49180eb50..61a3c7ecc 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1655,7 +1655,7 @@ class UnitOfWork implements PropertyChangedListener
 
             case self::STATE_DETACHED:
                 // Can actually not happen right now since we assume STATE_NEW.
-                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persist");
+                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted");
 
             default:
                 throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
@@ -1726,7 +1726,7 @@ class UnitOfWork implements PropertyChangedListener
                 break;
 
             case self::STATE_DETACHED:
-                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "remove");
+                throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed");
             default:
                 throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity));
         }