diff --git a/redminelib/__init__.py b/redminelib/__init__.py
index cc7e3b6..8754e66 100644
--- a/redminelib/__init__.py
+++ b/redminelib/__init__.py
@@ -76,8 +76,12 @@ def session(self, **options):
         engine = self.engine
         self.engine = engine.__class__(
             requests=utilities.merge_dicts(engine.requests, options.pop('requests', {})), **options)
-        yield self
-        self.engine = engine
+        try:
+            yield self
+        except exceptions.BaseRedmineError as e:
+            raise e
+        finally:
+            self.engine = engine
 
     def upload(self, f):
         """