diff --git a/src/Igorw/Silex/JsonConfigDriver.php b/src/Igorw/Silex/JsonConfigDriver.php
index c9c8680..949fe0f 100644
--- a/src/Igorw/Silex/JsonConfigDriver.php
+++ b/src/Igorw/Silex/JsonConfigDriver.php
@@ -25,7 +25,7 @@ public function supports($filename)
     private function parseJson($filename)
     {
         $json = file_get_contents($filename);
-        return json_decode($json, true);
+        return empty($json) ? array() : json_decode($json, true);
     }
 
     private function getJsonError($code)
diff --git a/src/Igorw/Silex/YamlConfigDriver.php b/src/Igorw/Silex/YamlConfigDriver.php
index 5b849a9..03d1bb3 100644
--- a/src/Igorw/Silex/YamlConfigDriver.php
+++ b/src/Igorw/Silex/YamlConfigDriver.php
@@ -11,7 +11,7 @@ public function load($filename)
         if (!class_exists('Symfony\\Component\\Yaml\\Yaml')) {
             throw new \RuntimeException('Unable to read yaml as the Symfony Yaml Component is not installed.');
         }
-        $config = Yaml::parse($filename);
+        $config = Yaml::parse(file_get_contents($filename));
         return $config ?: array();
     }