diff --git a/src/Symfony/Component/Validator/Constraints/ValidValidator.php b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
index b2f1f1c5a06b9..be5fbc12660ba 100644
--- a/src/Symfony/Component/Validator/Constraints/ValidValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/ValidValidator.php
@@ -26,6 +26,10 @@ public function validate($value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Valid');
         }
 
+        if (null === $value) {
+            return;
+        }
+
         $this->context
             ->getValidator()
             ->inContext($this->context)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
index f95650d359b3b..c4ccf1551f2a0 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ValidValidatorTest.php
@@ -20,6 +20,18 @@ public function testPropertyPathsArePassedToNestedContexts()
         $this->assertSame('fooBar.fooBarBaz.foo', $violations->get(0)->getPropertyPath());
     }
 
+    public function testNullValues()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validator = $validatorBuilder->enableAnnotationMapping()->getValidator();
+
+        $foo = new Foo();
+        $foo->fooBar = null;
+        $violations = $validator->validate($foo, null, array('nested'));
+
+        $this->assertCount(0, $violations);
+    }
+
     protected function createValidator()
     {
         return new ValidValidator();