diff --git a/hermes/client.py b/hermes/client.py
index 77b3452..f70a7c5 100644
--- a/hermes/client.py
+++ b/hermes/client.py
@@ -266,7 +266,7 @@ def execute_role_based_procedure(self):
                     self.log.warning('Server is a slave, stopping components')
                     self._stop_components()
                 break
-            except OperationalError:
+            except OperationalError as e:
                 self._stop_components()
 
                 self.log.warning(
@@ -277,7 +277,7 @@ def execute_role_based_procedure(self):
                 if backoff:  # pragma: no cover
                     backoff <<= 1
                     if backoff > 32:
-                        backoff = 1
+                        raise e
                 else:
                     backoff = 1
                 sleep(backoff)