diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 95aa34c50ef7..92f1699cfb9d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -65,7 +65,7 @@ public function getConfigTreeBuilder()
 
                         // convert the old configuration to the new one
                         if (isset($v['assets'])) {
-                            throw new LogicException('You cannot use assets settings under "templating.templating" and "assets" configurations in the same project.');
+                            throw new \LogicException('You cannot use assets settings under "framework.templating" and "assets" configurations in the same project.');
                         }
 
                         $v['assets'] = array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
index bbe54e9eb6a6..ea1d6c8ac06b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -86,6 +86,25 @@ public function testInvalidValueTrustedProxies()
         ));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage You cannot use assets settings under "framework.templating" and "assets" configurations in the same project.
+     */
+    public function testInvalidValueAssets()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $processor->processConfiguration($configuration, array(
+            array(
+                'templating' => array(
+                    'engines' => null,
+                    'assets_base_urls' => '//example.com',
+                ),
+                'assets' => null,
+            ),
+        ));
+    }
+
     protected static function getBundleDefaultConfig()
     {
         return array(