diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5e2ab7ed9c7..66886ea0061 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -329,4 +329,13 @@ def api_request?
   def render_attachment_warning_if_needed(obj)
     flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
   end
+
+  # Rescues an invalid query statement. Just in case...
+  def query_statement_invalid(exception)
+    logger.error "Query::StatementInvalid: #{exception.message}" if logger
+    session.delete(:query)
+    sort_clear if respond_to?(:sort_clear)
+    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
+  end
+
 end
diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index 91312e8ae28..3933577c532 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -7,6 +7,8 @@ class GanttsController < ApplicationController
   helper :projects
   helper :queries
   include QueriesHelper
+  helper :sort
+  include SortHelper
   include Redmine::Export::PDF
   
   def show
@@ -42,15 +44,6 @@ def show
 
   private
 
-  # Rescues an invalid query statement. Just in case...
-  # TODO: Refactor, move to ApplicationController with IssuesController
-  def query_statement_invalid(exception)
-    logger.error "Query::StatementInvalid: #{exception.message}" if logger
-    session.delete(:query)
-    sort_clear
-    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
-  end
-
   # TODO: Refactor, duplicates IssuesController
   def find_optional_project
     @project = Project.find(params[:project_id]) unless params[:project_id].blank?
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3eb7f18a22b..95218e02258 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -453,14 +453,6 @@ def find_optional_project
     render_404
   end
 
-  # Rescues an invalid query statement. Just in case...
-  def query_statement_invalid(exception)
-    logger.error "Query::StatementInvalid: #{exception.message}" if logger
-    session.delete(:query)
-    sort_clear
-    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
-  end
-
   # Used by #edit and #update to set some common instance variables
   # from the params
   # TODO: Refactor, not everything in here is needed by #edit