diff --git a/kallithea/templates/changelog/changelog_table.html b/kallithea/templates/changelog/changelog_table.html
--- a/kallithea/templates/changelog/changelog_table.html
+++ b/kallithea/templates/changelog/changelog_table.html
@@ -55,7 +55,7 @@
         <td class="date">
           <div data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
         </td>
-        <% message_lines = cs.message.splitlines() %>
+        <% message_lines = cs.message.strip().splitlines() or [_("(No commit message)")] %>
         %if len(message_lines) > 1:
         <td class="expand_commit" title="${_('Expand commit message')}">
           <i class="icon-align-left"></i>
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -167,7 +167,7 @@ ${self.repo_context_bar('showpullrequest
                               </span>
                             %endfor
                           </div>
-                          <div class="message">${h.urlify_text(cs.message.splitlines()[0], c.repo_name)}</div>
+                          <div class="message">${h.urlify_text(cs.message.strip().split('\n')[0] or _("(No commit message)"), c.repo_name)}</div>
                         </td>
                       %endif
                     </tr>