diff --git a/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php b/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php
index 8c018be201bb..e0573051eb27 100644
--- a/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php
+++ b/src/Symfony/Component/Security/Core/Encoder/PasswordEncoderInterface.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Security\Core\Encoder;
 
+use Symfony\Component\Security\Core\Exception\BadCredentialsException;
+
 /**
  * PasswordEncoderInterface is the interface for all encoders.
  *
@@ -25,6 +27,9 @@ interface PasswordEncoderInterface
      * @param string $salt The salt
      *
      * @return string The encoded password
+     *
+     * @throws BadCredentialsException   If the raw password is invalid, e.g. excessively long
+     * @throws \InvalidArgumentException If the salt is invalid
      */
     public function encodePassword($raw, $salt);
 
@@ -36,6 +41,8 @@ public function encodePassword($raw, $salt);
      * @param string $salt    The salt
      *
      * @return bool true if the password is valid, false otherwise
+     *
+     * @throws \InvalidArgumentException If the salt is invalid
      */
     public function isPasswordValid($encoded, $raw, $salt);
 }