diff --git a/system/db/manager.php b/system/db/manager.php
index 9f83bb68..f830e9f3 100644
--- a/system/db/manager.php
+++ b/system/db/manager.php
@@ -29,14 +29,12 @@ public static function connection($connection = null)
 
 		if ( ! array_key_exists($connection, static::$connections))
 		{
-			$config = Config::get('db.connections');
-
-			if ( ! array_key_exists($connection, $config))
+			if (is_null($config = Config::get('db.connections.'.$connection)))
 			{
 				throw new \Exception("Database connection [$connection] is not defined.");
 			}
 
-			static::$connections[$connection] = new Connection($connection, (object) $config[$connection], new Connector);
+			static::$connections[$connection] = new Connection($connection, (object) $config, new Connector);
 		}
 
 		return static::$connections[$connection];