diff --git a/.rbenv-version b/.rbenv-version
index 7c3272873..c5864dcf3 100644
--- a/.rbenv-version
+++ b/.rbenv-version
@@ -1 +1 @@
-2.1.1
\ No newline at end of file
+2.1.5
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index beca8b4d5..60d65653b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "uglifier"
 gem 'coffee-rails'
 gem "therubyracer", :platforms => :ruby
 gem "pry", :group => [:test, :development]
-gem "pry-debugger", :group => [:test, :development]
+gem "byebug", :group => [:test, :development]
 gem "rails", "~> 4.1.8"
 gem "pg"
 gem "kgio"
diff --git a/Gemfile.lock b/Gemfile.lock
index 388171e53..9b49d56b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,9 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.2.2)
+    byebug (3.2.0)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
@@ -76,17 +79,12 @@ GEM
       money (~> 6.0)
       multi_json (>= 1.3.4)
       oauth2 (~> 1.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     daemons (1.1.9)
     dalli (2.7.0)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
     delayed_job (4.0.1)
       activesupport (>= 3.0, < 4.2)
     delayed_job_active_record (4.0.1)
@@ -167,9 +165,6 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.3)
-      debugger (~> 1.3)
-      pry (>= 0.9.10, < 0.11.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -269,6 +264,7 @@ DEPENDENCIES
   awesome_print
   aws-s3!
   bcrypt-ruby
+  byebug
   capistrano
   capistrano-ext
   capistrano-unicorn
@@ -291,7 +287,6 @@ DEPENDENCIES
   pg
   protected_attributes
   pry
-  pry-debugger
   radix62 (~> 1.0.1)
   rails (~> 4.1.8)
   rmagick
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9608ad8cc..3ff3f4080 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,9 +12,9 @@ class ApplicationController < ActionController::Base
   # before_filter :secure_cookies_check
   layout "default"
 
+  rescue_from Exception, :with => :rescue_exception
   rescue_from User::PrivilegeError, :with => :access_denied
   rescue_from Danbooru::Paginator::PaginationError, :with => :render_pagination_limit
-  rescue_from Exception, :with => :rescue_exception
 
 protected
   def api_check
diff --git a/test/functional/forum_posts_controller_test.rb b/test/functional/forum_posts_controller_test.rb
index 2900dda54..2d0791d01 100644
--- a/test/functional/forum_posts_controller_test.rb
+++ b/test/functional/forum_posts_controller_test.rb
@@ -69,7 +69,7 @@ class ForumPostsControllerTest < ActionController::TestCase
         end
 
         forum_post = ForumPost.last
-        assert_redirected_to(forum_topic_path(@forum_topic, :page => 1))
+        assert_redirected_to(forum_topic_path(@forum_topic))
       end
     end