diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index 2e1c86e508998..ce5104dc41cc5 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -68,7 +68,9 @@ public function warmUp($cacheDir)
 
         foreach ($this->extractSupportedLoaders($loaders) as $loader) {
             foreach ($loader->getMappedClasses() as $mappedClass) {
-                $metadataFactory->getMetadataFor($mappedClass);
+                if ($metadataFactory->hasMetadataFor($mappedClass)) {
+                    $metadataFactory->getMetadataFor($mappedClass);
+                }
             }
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
index 72cc30dc662ec..b23760ae4556c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Resources/person.xml
@@ -15,4 +15,15 @@
             </constraint>
         </property>
     </class>
+
+    <class name="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Validation\NonExistentClass">
+        <property name="gender">
+            <constraint name="Choice">
+                <option name="choices">
+                    <value>other</value>
+                </option>
+                <option name="message">This should be ignored.</option>
+            </constraint>
+        </property>
+    </class>
 </constraint-mapping>