diff --git a/classes/Config.php b/classes/Config.php
index 0c3fde3..a716524 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -141,7 +141,7 @@ class Config
         if (is_null(self::$instance) || self::$instance->file != $yamlfile) {
             if (is_file($yamlfile)) {
                 $options = Yaml::parse(file_get_contents($yamlPath));
-            } elseif ($yamlfile == 'config.yml') {
+            } elseif ($yamlfile == 'config.yml' || empty($yamlfile)) {
                 /*
                 Allow for the default file to be missing in order to
                 not surprise users that did not create a config file
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index 0574eaf..a11d766 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -64,6 +64,16 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
         Config::getInstance('foo');
     }
 
+    /**
+     * Test the getInstance function with aen empty filename.
+     *
+     * @return void
+     */
+    public function testGetInstanceWithEmptyFile()
+    {
+        $config = Config::getInstance('');
+    }
+
     /**
      * Test the getInstance function with the CONVERT and PYTHON environment variables.
      *