diff --git a/oauth2client/tools.py b/oauth2client/tools.py
index 05e8b05..f2add0b 100644
--- a/oauth2client/tools.py
+++ b/oauth2client/tools.py
@@ -30,7 +30,7 @@
 import sys
 
 from optparse import OptionParser
-from apiclient.oauth import RequestError
+from client import FlowExchangeError
 
 try:
     from urlparse import parse_qsl
@@ -140,7 +140,7 @@
 
   try:
     credentials = flow.step2_exchange(code)
-  except RequestError:
+  except FlowExchangeError:
     sys.exit('The authentication has failed.')
 
   storage.put(credentials)