X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/95c3d640a44857b0b92ec3be6dad606e40057c5c..9bdade37af7984b6d30dbe5397dfcdebef261bff:/app/controllers/user_blocks_controller.rb

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index 7d3830c25..fd9f03c4a 100644
--- a/app/controllers/user_blocks_controller.rb
+++ b/app/controllers/user_blocks_controller.rb
@@ -109,8 +109,7 @@ class UserBlocksController < ApplicationController
   private
   ##
   # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the login screen where they might be able to login as
-  # a moderator.
+  # and return them to the blocks index.
   def require_moderator
     unless @user.moderator?
       flash[:notice] = t('user_block.filter.not_a_moderator')
@@ -122,12 +121,16 @@ class UserBlocksController < ApplicationController
   # ensure that there is a "this_user" instance variable
   def lookup_this_user
     @this_user = User.find_by_display_name(params[:display_name])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
 
   ##
   # ensure that there is a "user_block" instance variable
   def lookup_user_block
     @user_block = UserBlock.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found
   end
 
   ##