diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
index ffaff1144d..287079fffb 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -265,11 +265,18 @@ class ProfilerController extends ContainerAware
             }
 
             list($name, $template) = $arguments;
+            if (!$profiler->has($name)) {
+                continue;
+            }
             if ('.html.twig' === substr($template, -10)) {
                 $template = substr($template, 0, -10);
             }
-            if (!$profiler->has($name) || !$this->container->get('templating')->exists($template.'.html.twig')) {
-                continue;
+            if (!$this->container->get('templating')->exists($template.'.html.twig')) {
+                throw new \UnexpectedValueException(sprintf(
+                    'The profiler template "%s.html.twig" for data collector "%s" does not exist.',
+                    $template,
+                    $name
+                ));
             }
 
             $templates[$name] = $template.'.html.twig';