diff --git a/src/Connector.php b/src/Connector.php
index 948b6f2..3569a34 100644
--- a/src/Connector.php
+++ b/src/Connector.php
@@ -48,18 +48,18 @@ public function getConfig($dsn)
 
                 if ($config->getCluster()) {
                     $clusterKeys = $backend->getKeys('clusters/' . $config->getCluster());
-                    if (!$clusterKeys) {
-                        throw new RuntimeException("No configuration keys found for cluster: " . $config->getCluster());
+                    if ($clusterKeys) {
+                        $this->loadKeys($config, $clusterKeys);
                     }
-                    $this->loadKeys($config, $clusterKeys);
                 }
 
                 if ($config->getServer()) {
                     $serverKeys = $backend->getKeys('servers/' . $config->getServer());
-                    if (!$serverKeys) {
-                        throw new RuntimeException("No configuration keys found for server: " . $config->getServer());
+                    if ($serverKeys) {
+                        $this->loadKeys($config, $serverKeys);
+                    } else {
+                        $config->setAddress($config->getServer());
                     }
-                    $this->loadKeys($config, $serverKeys);
                 }
                 return $config;
             }