diff --git a/src/resources/changes_resource.rs b/src/resources/changes_resource.rs
index b96da11..7397ce2 100644
--- a/src/resources/changes_resource.rs
+++ b/src/resources/changes_resource.rs
@@ -247,11 +247,6 @@ impl Resource for ChangesResource {
             .and_then(move |(mut data, head)| {
                 use std::iter::Iterator;
 
-                if data.len() == 0 {
-                    // TODO Handle degenerate case
-                    unimplemented!("Cannot deal with empty result sets");
-                }
-
                 let extra_element = if data.len() > self.limit as usize {
                     data.pop()
                 } else {
diff --git a/templates/changes.html b/templates/changes.html
index 4adabc1..3589dcc 100644
--- a/templates/changes.html
+++ b/templates/changes.html
@@ -9,11 +9,13 @@
     ><li><a rel="first" href="{{.end}}">Most recent changes</a></li
 ></ul></nav>{{/newer}}
 <table>
+    {{#changes?}}
     <tr>
         <th>Article</th>
         <th>Updated</th>
         <th>Author</th>
     </tr>
+    {{/changes}}
     {{#changes}}
     <tr>
         <td><a href="{{#.slug.is_empty()?}}.{{/.slug.is_empty()}}{{.slug}}">{{.title}}</a></td>
@@ -22,6 +24,9 @@
     </tr>
     {{/changes}}
 </table>
+{{^changes?}}
+<p>No hits</p>
+{{/changes}}
 {{#older}}<nav><ul class="dense"
     ><li><a rel="next" href="{{.more}}">Older changes</a></li
     ><li><a rel="last" href="{{.end}}">First changes</a></li