diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index f1b54668..4e7de84f 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -21,4 +21,11 @@ module CommitsHelper
     link_to "More", project_commits_path(@project, :offset =>  offset.to_i + limit.to_i, :limit => limit),
       :remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
   end
+
+  def truncate_commit_message(commit, size = 60)
+    truncate(commit.message, :length => size)
+  # if special characters occurs
+  rescue
+    commit.message.length > size ? (commit.message[0..(size - 1)] + "...") : commit.message
+  end
 end
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index 4eebb83a..5a3ba3a7 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -11,7 +11,7 @@
             = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
           %p
             %strong
-              = commit.message.length > 60 ? (commit.message[0..59] + "...") : commit.message
+              = truncate_commit_message(commit)
             = link_to "Browse Code", tree_project_path(@project, :commit_id => commit.id), :class => "lite_button", :style => "float:right"
             = link_to truncate(commit.id.to_s, :length => 16), project_commit_path(@project, :id => commit.id), :class => "lite_button", :style => "width:120px;float:right"
           %span
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index 147aaafb..a2c9149d 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -1,5 +1,5 @@
 %h3
-  = "[ #{@commit.committer} ]  #{truncate @commit.message, :length => 80}"
+  = "[ #{@commit.committer} ]  #{truncate_commit_message(@commit, 80)}"
 -#= link_to 'Back', project_commits_path(@project), :class => "button"
 %table.round-borders
   %tr
diff --git a/app/views/projects/_tree_item.html.haml b/app/views/projects/_tree_item.html.haml
index 9ba33c1e..4ebcfbef 100644
--- a/app/views/projects/_tree_item.html.haml
+++ b/app/views/projects/_tree_item.html.haml
@@ -12,4 +12,4 @@
     = time_ago_in_words(content_commit.committed_date)
     ago
   %td
-    = link_to truncate(content_commit.message, :length => 40), project_commit_path(@project, content_commit)
+    = link_to truncate_commit_message(content_commit, 40), project_commit_path(@project, content_commit)