diff --git a/requests/sessions.py b/requests/sessions.py
index 9eaa36ae..ba09612e 100644
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -110,7 +110,11 @@ class SessionRedirectMixin(object):
                 resp.raw.read(decode_content=False)
 
             if i >= self.max_redirects:
-                raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
+                raise TooManyRedirects(
+                    'Exceeded %s redirects.' % self.max_redirects,
+                    request=prepared_request,
+                    response=resp
+                )
 
             # Release the connection back into the pool.
             resp.close()
diff --git a/test_requests.py b/test_requests.py
index 07952418..80602294 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -23,8 +23,8 @@ from requests.compat import (
 from requests.cookies import cookiejar_from_dict, morsel_to_cookie
 from requests.exceptions import (ConnectionError, ConnectTimeout,
                                  InvalidSchema, InvalidURL, MissingSchema,
-                                 ReadTimeout, Timeout, RetryError)
-from requests.models import PreparedRequest
+                                 ReadTimeout, Timeout, RetryError, TooManyRedirects)
+from requests.models import PreparedRequest, DEFAULT_REDIRECT_LIMIT
 from requests.structures import CaseInsensitiveDict
 from requests.sessions import SessionRedirectMixin
 from requests.models import urlencode
@@ -188,6 +188,26 @@ class TestRequests(object):
         assert r.history[0].status_code == 302
         assert r.history[0].is_redirect
 
+    def test_HTTP_302_TOO_MANY_REDIRECTS(self, httpbin):
+        try:
+            requests.get(httpbin('redirect', '50'))
+        except TooManyRedirects, e:
+            assert e.request is not None
+            assert len(e.response.history) == DEFAULT_REDIRECT_LIMIT
+        else:
+            assert False
+
+    def test_HTTP_302_TOO_MANY_REDIRECTS_WITH_PARAMS(self, httpbin):
+        s = requests.session()
+        s.max_redirects = 5
+        try:
+            s.get(httpbin('redirect', '50'))
+        except TooManyRedirects, e:
+            assert e.request is not None
+            assert len(e.response.history) == 5
+        else:
+            assert False
+
     # def test_HTTP_302_ALLOW_REDIRECT_POST(self):
     #     r = requests.post(httpbin('status', '302'), data={'some': 'data'})
     #     self.assertEqual(r.status_code, 200)