Use rescue_from controller's helper instead of rescuing from within
before_filter.
Merge branch 'improvements'