diff --git a/composer.json b/composer.json
index 5205b8c..c41a8dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
     ],
     "require": {
         "php": ">=5.3",
-        "react/promise": "1.*|2.*",
-        "react/socket-client": "0.3.*|0.4.*",
+        "react/promise": "^2.0 || ^1.1",
+        "react/socket-client": "^0.5 || ^0.4 || ^0.3",
         "react/event-loop": "0.3.*|0.4.*",
         "clue/redis-protocol": "0.3.*",
         "evenement/evenement": "~1.0|~2.0"
diff --git a/src/Factory.php b/src/Factory.php
index 269a147..69318c1 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -12,6 +12,7 @@
 use BadMethodCallException;
 use Exception;
 use React\EventLoop\LoopInterface;
+use React\Promise;
 
 class Factory
 {
@@ -109,13 +110,8 @@ private function connect($target)
     {
         try {
             $parts = $this->parseUrl($target);
-        }
-        catch (Exception $e) {
-            if (class_exists('React\Promise\When')) {
-                return \React\Promise\When::reject($e);
-            } else {
-                return \React\Promise\reject($e);
-            }
+        } catch (Exception $e) {
+            return Promise\reject($e);
         }
 
         return $this->connector->create($parts['host'], $parts['port']);