diff --git a/src/Blablacar/Redis/Client.php b/src/Blablacar/Redis/Client.php
index 8203d92..bab544b 100644
--- a/src/Blablacar/Redis/Client.php
+++ b/src/Blablacar/Redis/Client.php
@@ -54,7 +54,11 @@ public function connect()
         $this->redis = new \Redis();
         $this->redis->connect($this->host, $this->port);
         if (null !== $this->base) {
-            $this->redis->select($this->base);
+            try {
+                $this->redis->select($this->base);
+            } catch (\RedisException $e) {
+                throw new \RedisException(sprintf('%s (%s:%d)', $e->getMessage(), $this->host, $this->port), $e->getCode(), $e);
+            }
         }
     }