diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
index be5cdeecc2..bae74387a8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RequestDataCollector.php
@@ -70,7 +70,7 @@ class RequestDataCollector extends BaseRequestDataCollector
      */
     public function getRoute()
     {
-        return $this->data['request_attributes']['_route'];
+        return isset($this->data['request_attributes']['_route']) ? $this->data['request_attributes']['_route'] : '';
     }
 
     /**
@@ -80,7 +80,7 @@ class RequestDataCollector extends BaseRequestDataCollector
      */
     public function getRouteParams()
     {
-        return $this->data['request_attributes']['_route_params'];
+        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : array();
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig
index dea1dfb986..1d6ba1a7c6 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig
@@ -1,9 +1,16 @@
 <h2>Routing for "{{ request.pathinfo }}"</h2>
 
 <ul>
-    <li><strong>Route:&nbsp;</strong>{{ request.route }}</li>
     <li>
-        <strong>Route parameters:</strong>
+        <strong>Route:&nbsp;</strong>
+        {% if request.route %}
+            {{ request.route }}
+        {% else %}
+            <em>No matching route</em>
+        {% endif %}
+    </li>
+    <li>
+        <strong>Route parameters:&nbsp;</strong>
         {% if request.routeParams|length %}
             {% include 'WebProfilerBundle:Profiler:table.html.twig' with { 'data': request.routeParams, 'class': 'inline' } only %}
         {% else %}
@@ -16,7 +23,7 @@
     <li>
     {% endif %}
     <li>
-        <strong>Route matching:</strong>
+        <strong>Route matching logs</strong>
         <table class="routing inline">
             <tr>
                 <th>Route name</th>