symfony
diff --git a/‎src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+19Lines changed: 19 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/composer.json
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/composer.json
+2-1Lines changed: 2 additions & 1 deletion
@@ -135,17 +135,17 @@ private function templateExists($template)
         if ($this->templating instanceof EngineInterface) {
             try {
                 return $this->templating->exists($template);
-            } catch (\InvalidArgumentException $e) {
+            } catch (\Exception $e) {
                 return false;
             }
         }
 
         $loader = $this->templating->getLoader();
-        if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
-            return $loader->exists($template);
-        }
-
         try {
+            if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
+                return $loader->exists($template);
+            }
+
             if (method_exists($loader, 'getSourceContext')) {
                 $loader->getSourceContext($template);
             } else {
 
@@ -16,6 +16,8 @@
 use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
 use Symfony\Component\HttpKernel\UriSigner;
 use Symfony\Component\HttpFoundation\Request;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
 
 class HIncludeFragmentRendererTest extends TestCase
 {
@@ -86,4 +88,21 @@ public function testRenderWithDefaultText()
         $strategy = new HIncludeFragmentRenderer($engine);
         $this->assertEquals('<hx:include src="/foo">default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'default'))->getContent());
     }
+
+    public function testRenderWithEngineAndDefaultText()
+    {
+        $engine = $this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
+        $engine->expects($this->once())
+            ->method('exists')
+            ->with('loading...')
+            ->will($this->throwException(new \RuntimeException()));
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer($engine);
+        $this->assertEquals('<hx:include src="/foo">loading...</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => 'loading...'))->getContent());
+
+        // only default
+        $strategy = new HIncludeFragmentRenderer(new Environment(new FilesystemLoader()));
+        $this->assertEquals('<hx:include src="/foo">@default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => '@default'))->getContent());
+    }
 }
@@ -38,7 +38,8 @@
         "symfony/stopwatch": "~2.3|~3.0.0",
         "symfony/templating": "~2.2|~3.0.0",
         "symfony/translation": "^2.0.5|~3.0.0",
-        "symfony/var-dumper": "~2.6|~3.0.0"
+        "symfony/var-dumper": "~2.6|~3.0.0",
+        "twig/twig": "~1.34|~2.4"
     },
     "conflict": {
         "symfony/config": "<2.7",