diff --git a/app/models/appci.py b/app/models/appci.py
index a281bab..65e59e3 100644
--- a/app/models/appci.py
+++ b/app/models/appci.py
@@ -112,7 +112,12 @@ class App(db.Model):
                                           .first()
             if most_recent_test:
                 yield most_recent_test
-
+            else:
+                yield AppCIResult(app = self,
+                                  branch = branch,
+                                  level = None,
+                                  date = datetime.datetime.fromtimestamp(0),
+                                  results = [ None for t in AppCI.tests ])
 
 class AppCIBranch(db.Model):
 
@@ -156,6 +161,12 @@ class AppCIBranch(db.Model):
                                           .first()
             if most_recent_test:
                 yield most_recent_test
+            else:
+                yield AppCIResult(app = app,
+                                  branch = self,
+                                  level = None,
+                                  date = datetime.datetime.fromtimestamp(0),
+                                  results = [ None for t in AppCI.tests ])
 
 
 class AppCIResult(db.Model):
@@ -183,7 +194,7 @@ class AppCIResult(db.Model):
 
     def score(self):
         s_dict = { True: +1, False: -1, None: 0 }
-        return sum([ s_dict[result] for result in self.results.values() ])
+        return sum([ s_dict[result] for result in self.results ])
 
 
 class AppCI():
diff --git a/app/templates/appci_app.html b/app/templates/appci_app.html
index 0cb6434..9ce546b 100644
--- a/app/templates/appci_app.html
+++ b/app/templates/appci_app.html
@@ -40,10 +40,18 @@
                         </td>
                     {% endfor %}
                     <td class="ci-app-test-info">
-                        {% if result.date == None %}
-                            <span class="daysAgo" href="{{ result.url.replace("consoleText", "consoleFull") }}">???</span>
+                        {% if result.url == None %}
+				{% if result.date == None %}
+				    <span class="daysAgo">???</span>
+				{% else %}
+				    <span class="daysAgo" timestamp="{{ result.date.timestamp() }}"></span>
+				{% endif %}
                         {% else %}
-                            <span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ result.url.replace("consoleText", "consoleFull") }}"></span>
+				{% if result.date == None %}
+				    <span class="daysAgo" href="{{ result.url.replace("consoleText", "consoleFull") }}">???</span>
+				{% else %}
+				    <span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ result.url.replace("consoleText", "consoleFull") }}"></span>
+				{% endif %}
                         {% endif %}
                         {% if result.commit != result.app.master_commit %}
                         <span class="oi oi-clock text-warning"
diff --git a/app/templates/appci_branch.html b/app/templates/appci_branch.html
index cc7c728..d3a177a 100644
--- a/app/templates/appci_branch.html
+++ b/app/templates/appci_branch.html
@@ -76,10 +76,18 @@
                         </td>
                     {% endfor %}
                     <td class="ci-app-test-info px-0">
-                        {% if result.date == None %}
-                            <span class="daysAgo" href="{{ result.url.replace("consoleText", "consoleFull") }}">???</span>
+                        {% if result.url == None %}
+				{% if result.date == None %}
+				    <span class="daysAgo">???</span>
+				{% else %}
+				    <span class="daysAgo" timestamp="{{ result.date.timestamp() }}"></span>
+				{% endif %}
                         {% else %}
-                            <span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ result.url.replace("consoleText", "consoleFull") }}"></span>
+				{% if result.date == None %}
+				    <span class="daysAgo" href="{{ result.url.replace("consoleText", "consoleFull") }}">???</span>
+				{% else %}
+				    <span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ result.url.replace("consoleText", "consoleFull") }}"></span>
+				{% endif %}
                         {% endif %}
                         {% if result.commit != result.app.master_commit %}
                         <span class="oi oi-clock text-warning"