diff --git a/app/views/versions/_issue_statistics.html.erb b/app/views/versions/_issue_statistics.html.erb
index 5e822be3f..b8c0ff2e3 100644
--- a/app/views/versions/_issue_statistics.html.erb
+++ b/app/views/versions/_issue_statistics.html.erb
@@ -11,7 +11,7 @@
   <tbody>
   <% @version_issue_assigned_name.each do | assigned | %>
       <tr>
-        <td><%= User.find(assigned[0]).show_name %></td>
+        <td><%= User.find(assigned[0]).try(:show_name) %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0]).count %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 3).count %></td>
         <td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 5).count %></td>
diff --git a/config/settings.yml b/config/settings.yml
index dc89093f1..c97fd74ca 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -103,7 +103,7 @@ feeds_limit:
   default: 15
 gantt_items_limit:
   format: int
-  default: 500
+  default: 10000
 # Maximum size of files that can be displayed
 # inline through the file viewer (in KB)
 file_max_size_displayed: