diff --git a/ref-test/app/admin/templates/admin/components/certificate.html b/ref-test/app/admin/templates/admin/components/certificate.html
index 1263357..6800e7c 100644
--- a/ref-test/app/admin/templates/admin/components/certificate.html
+++ b/ref-test/app/admin/templates/admin/components/certificate.html
@@ -50,7 +50,7 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Time</h5>
                         </div>
-                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
+                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -59,7 +59,7 @@
                                 <span class="badge bg-danger">Late</span>
                             {% endif %}
                         </div>
-                        {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') }}
+                        {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') if entry.end_time else None }}
                     </li>       
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
diff --git a/ref-test/app/admin/templates/admin/index.html b/ref-test/app/admin/templates/admin/index.html
index ca644f8..4b355ec 100644
--- a/ref-test/app/admin/templates/admin/index.html
+++ b/ref-test/app/admin/templates/admin/index.html
@@ -28,7 +28,7 @@
                                                     <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ test.end_date.strftime('%d %b %Y') }}
+                                                    {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
                                                 </td>
                                             </tr>
                                         {% endfor %}
@@ -72,7 +72,7 @@
                                                     <a href="{{ url_for('admin._view_entry', id=result.id) }}">{{ result.get_surname() }}, {{ result.get_first_name() }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ result.end_time.strftime('%d %b %Y %H:%M') }}
+                                                    {{ result.end_time.strftime('%d %b %Y %H:%M') if result.end_time else None }}
                                                 </td>
                                                 <td>
                                                     {{ (100*result.result['score']/result.result['max'])|round|int }}&percnt; ({{ result.result.grade }})
@@ -117,7 +117,7 @@
                                                         <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
                                                     </td>
                                                     <td>
-                                                        {{ test.end_date.strftime('%d %b %Y') }}
+                                                        {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
                                                     </td>
                                                 </tr>
                                             {% endfor %}
diff --git a/ref-test/app/admin/templates/admin/result-detail.html b/ref-test/app/admin/templates/admin/result-detail.html
index 6a8bd6b..daffa8e 100644
--- a/ref-test/app/admin/templates/admin/result-detail.html
+++ b/ref-test/app/admin/templates/admin/result-detail.html
@@ -49,7 +49,7 @@
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Start Time</h5>
                             </div>
-                            {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
+                            {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
                         </li>
                     {% endif %}
                     <li class="list-group-item list-group-item-action">
diff --git a/ref-test/app/admin/templates/admin/test.html b/ref-test/app/admin/templates/admin/test.html
index a4cf407..6be88e2 100644
--- a/ref-test/app/admin/templates/admin/test.html
+++ b/ref-test/app/admin/templates/admin/test.html
@@ -32,13 +32,13 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Date</h5>
                         </div>
-                        {{ test.start_date.strftime('%d %b %Y %H:%M') }}
+                        {{ test.start_date.strftime('%d %b %Y %H:%M') if test.start_date else None }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Expiry Date</h5>
                         </div>
-                        {{ test.end_date.strftime('%d %b %Y %H:%M') }}
+                        {{ test.end_date.strftime('%d %b %Y %H:%M') if test.end_date else None }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">