diff --git a/oauth2client/client.py b/oauth2client/client.py
index 3440c23..07df411 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -754,6 +754,8 @@
 
 
 def _urlsafe_b64decode(b64string):
+  # Guard against unicode strings, which base64 can't handle.
+  b64string = b64string.encode('ascii')
   padded = b64string + '=' * (4 - len(b64string) % 4)
   return base64.urlsafe_b64decode(padded)
 
diff --git a/oauth2client/crypt.py b/oauth2client/crypt.py
index 523c921..323345a 100644
--- a/oauth2client/crypt.py
+++ b/oauth2client/crypt.py
@@ -137,6 +137,8 @@
 
 
 def _urlsafe_b64decode(b64string):
+  # Guard against unicode strings, which base64 can't handle.
+  b64string = b64string.encode('ascii')
   padded = b64string + '=' * (4 - len(b64string) % 4)
   return base64.urlsafe_b64decode(padded)