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
+17Lines changed: 17 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
+17Lines changed: 17 additions & 0 deletions
@@ -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 {
 
@@ -86,4 +86,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 \Twig_Environment(new \Twig_Loader_Filesystem()));
+        $this->assertEquals('<hx:include src="/foo">@default</hx:include>', $strategy->render('/foo', Request::create('/'), array('default' => '@default'))->getContent());
+    }
 }