diff --git a/oauth2/__init__.py b/oauth2/__init__.py
index 38bf520b..3f3c6d52 100644
--- a/oauth2/__init__.py
+++ b/oauth2/__init__.py
@@ -536,7 +536,7 @@ def from_request(cls, http_method, http_url, headers=None, parameters=None,
                     # Get the parameters from the header.
                     header_params = cls._split_header(auth_header)
                     parameters.update(header_params)
-                except:
+                except Exception:
                     raise Error('Unable to parse OAuth parameters from '
                         'Authorization header.')
  
@@ -733,7 +733,7 @@ def _get_version(self, request):
         """Return the version of the request for this server."""
         try:
             version = request.get_parameter('oauth_version')
-        except:
+        except Exception:
             version = OAUTH_VERSION
 
         return version