diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
index b407857146..d813367dfb 100644
--- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb
+++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb
@@ -362,8 +362,11 @@ module Homebrew
           remote_url = Utils.popen_read("git remote get-url --push origin").chomp
           username = formula.tap.user
         else
-          remote_url, username = GitHub.forked_repo_info!(tap_full_name) do
+          begin
+            remote_url, username = GitHub.forked_repo_info!(tap_full_name)
+          rescue *GitHub.api_errors => e
             formula.path.atomic_write(old_contents)
+            odie "Unable to fork: #{e.message}!"
           end
         end
 
diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb
index 60f626b5ef..c04289fcbe 100644
--- a/Library/Homebrew/utils/github.rb
+++ b/Library/Homebrew/utils/github.rb
@@ -606,10 +606,6 @@ module GitHub
 
   def forked_repo_info!(tap_full_name)
     response = GitHub.create_fork(tap_full_name)
-  rescue GitHub::AuthenticationFailedError, *GitHub.api_errors => e
-    yield
-    odie "Unable to fork: #{e.message}!"
-  else
     # GitHub API responds immediately but fork takes a few seconds to be ready.
     sleep 1 until GitHub.check_fork_exists(tap_full_name)
     remote_url = if system("git", "config", "--local", "--get-regexp", "remote\..*\.url", "git@github.com:.*")