symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
+7Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
+7Lines changed: 7 additions & 0 deletions
@@ -62,4 +62,19 @@ public function testGetInstanceReturnsService()
         $factory = new ConstraintValidatorFactory($container, array('validator_constraint_alias' => 'validator_constraint_service'));
         $this->assertSame($validator, $factory->getInstance($constraint));
     }
+
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
+     */
+    public function testGetInstanceInvalidValidatorClass()
+    {
+        $constraint = $this->getMock('Symfony\\Component\\Validator\\Constraint');
+        $constraint
+            ->expects($this->once())
+            ->method('validatedBy')
+            ->will($this->returnValue('Fully\\Qualified\\ConstraintValidator\\Class\\Name'));
+
+        $factory = new ConstraintValidatorFactory(new Container());
+        $factory->getInstance($constraint);
+    }
 }
@@ -15,6 +15,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
+use Symfony\Component\Validator\Exception\ValidatorException;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
@@ -61,13 +62,19 @@ public function __construct(ContainerInterface $container, array $validators = a
      *
      * @return ConstraintValidatorInterface A validator for the supplied constraint
      *
+     * @throws ValidatorException      When the validator class does not exist
      * @throws UnexpectedTypeException When the validator is not an instance of ConstraintValidatorInterface
      */
     public function getInstance(Constraint $constraint)
     {
         $name = $constraint->validatedBy();
 
         if (!isset($this->validators[$name])) {
+            if (!class_exists($name)) {
+                throw new ValidatorException(sprintf(
+                    'Constraint validator "%s" does not exist or it is not enabled. Check the "validatedBy" method in your constraint class "%s"', $name, get_class($constraint)));
+            }
+
             $this->validators[$name] = new $name();
         } elseif (is_string($this->validators[$name])) {
             $this->validators[$name] = $this->container->get($this->validators[$name]);