diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 61dba882e..2b60927e1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -110,7 +110,7 @@ class ApplicationController < ActionController::Base
     elsif exception.is_a?(NotImplementedError)
       flash[:notice] = "This feature isn't available: #{@exception.message}"
       respond_to do |fmt|
-        fmt.html { redirect_to :back }
+        fmt.html { redirect_back fallback_location: root_path }
         fmt.js { render nothing: true, status: 501 }
         fmt.json { render template: "static/error", status: 501 }
         fmt.xml  { render template: "static/error", status: 501 }
diff --git a/app/controllers/wiki_page_versions_controller.rb b/app/controllers/wiki_page_versions_controller.rb
index 34398adb9..97d6c9003 100644
--- a/app/controllers/wiki_page_versions_controller.rb
+++ b/app/controllers/wiki_page_versions_controller.rb
@@ -17,7 +17,7 @@ class WikiPageVersionsController < ApplicationController
 
   def diff
     if params[:thispage].blank? || params[:otherpage].blank?
-      redirect_to :back, :notice => "You must select two versions to diff"
+      redirect_back fallback_location: wiki_pages_path, notice: "You must select two versions to diff"
       return
     end