diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
index ba843837666e..4fa445c932d1 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -193,21 +193,25 @@ private function getDocBlock($class, $property)
 
         $ucFirstProperty = ucfirst($property);
 
-        switch (true) {
-            case $docBlock = $this->getDocBlockFromProperty($class, $property):
-                $data = array($docBlock, self::PROPERTY, null);
-                break;
+        try {
+            switch (true) {
+                case $docBlock = $this->getDocBlockFromProperty($class, $property):
+                    $data = array($docBlock, self::PROPERTY, null);
+                    break;
 
-            case list($docBlock) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::ACCESSOR):
-                $data = array($docBlock, self::ACCESSOR, null);
-                break;
+                case list($docBlock) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::ACCESSOR):
+                    $data = array($docBlock, self::ACCESSOR, null);
+                    break;
 
-            case list($docBlock, $prefix) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::MUTATOR):
-                $data = array($docBlock, self::MUTATOR, $prefix);
-                break;
+                case list($docBlock, $prefix) = $this->getDocBlockFromMethod($class, $ucFirstProperty, self::MUTATOR):
+                    $data = array($docBlock, self::MUTATOR, $prefix);
+                    break;
 
-            default:
-                $data = array(null, null, null);
+                default:
+                    $data = array(null, null, null);
+            }
+        } catch (\InvalidArgumentException $e) {
+            $data = array(null, null, null);
         }
 
         return $this->docBlocks[$propertyHash] = $data;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
index 6049df7f6374..aac810fb0051 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractors/PhpDocExtractorTest.php
@@ -70,4 +70,14 @@ public function typesProvider()
             array('donotexist', null, null, null),
         );
     }
+
+    public function testReturnNullOnEmptyDocBlock()
+    {
+        $this->assertNull($this->extractor->getShortDescription(EmptyDocBlock::class, 'foo'));
+    }
+}
+
+class EmptyDocBlock
+{
+    public $foo;
 }