diff --git a/system/config.php b/system/config.php
index 5cc0d30f..e1727da9 100644
--- a/system/config.php
+++ b/system/config.php
@@ -7,7 +7,7 @@ class Config {
 	 *
 	 * @var array
 	 */
-	private static $items = array();
+	public static $items = array();
 
 	/**
 	 * Determine if a configuration item or file exists.
@@ -112,7 +112,10 @@ class Config {
 			$config = array_merge($config, require $path);
 		}
 
-		return static::$items[$file] = $config;
+		if (count($config) > 0)
+		{
+			static::$items[$file] = $config;
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/system/db/query.php b/system/db/query.php
index c4383d52..5260f9a8 100644
--- a/system/db/query.php
+++ b/system/db/query.php
@@ -413,7 +413,6 @@ class Query {
 	 */
 	public function first($columns = array('*'))
 	{
-
 		return (count($results = $this->take(1)->get($columns)) > 0) ? $results[0] : null;
 	}