diff --git a/runbot/controllers/frontend.py b/runbot/controllers/frontend.py
index e5f8360a..d92a81e5 100644
--- a/runbot/controllers/frontend.py
+++ b/runbot/controllers/frontend.py
@@ -113,7 +113,7 @@ class Runbot(http.Controller):
             def branch_info(branch):
                 return {
                     'branch': branch,
-                    'builds': [self.build_info(build_dict[build_id]) for build_id in build_by_branch_ids[branch.id]]
+                    'builds': [self.build_info(build_dict[build_id]) for build_id in build_by_branch_ids.get(branch.id) or []]
                 }
 
             context.update({
diff --git a/runbot/templates/frontend.xml b/runbot/templates/frontend.xml
index 1c50219e..bf5e0256 100644
--- a/runbot/templates/frontend.xml
+++ b/runbot/templates/frontend.xml
@@ -120,7 +120,7 @@
                               <td>
                                   <i t-if="br['branch'].sticky" class="fa fa-star" style="color: #f0ad4e" />
                                   <b t-esc="br['branch'].branch_name"/>
-                                  <small><t t-esc="br['builds'][0]['job_age']"/></small><br/>
+                                  <small><t t-esc="br['builds'] and br['builds'][0]['job_age']"/></small><br/>
                                   <div class="btn-group btn-group-xs">
                                       <a t-attf-href="{{br['branch'].branch_url}}" class="btn btn-default btn-xs">Branch or pull <i class="fa fa-github"/></a>
                                       <a t-attf-href="/runbot/#{repo.id}/#{br['branch'].branch_name}" class="btn btn-default btn-xs" aria-label="Quick Connect"><i class="fa fa-fast-forward" title="Quick Connect"/></a>