diff --git a/app/views/cms/view.rhtml b/app/views/cms/view.rhtml
index 93ea10a..6045548 100644
--- a/app/views/cms/view.rhtml
+++ b/app/views/cms/view.rhtml
@@ -51,7 +51,7 @@
 
       <ul>
         <li>
-        <%= _('"%{article}", last changed by %{author}') % { :article => @article.name, :author => (@article.last_changed_by.name || _('Unknown User')) } %>
+        <%= _('"%{article}", last changed by %{author}') % { :article => @article.name, :author => (@article.last_changed_by ? @article.last_changed_by.name : _('Unknown User')) } %>
         </li>
         <li>
         <%= _('Public address of this article: %s') % (@article.public_path) %>
--
libgit2 0.21.2