diff --git a/Mage/Config.php b/Mage/Config.php
index 3d5740f..cc989cf 100644
--- a/Mage/Config.php
+++ b/Mage/Config.php
@@ -158,7 +158,11 @@ class Mage_Config
     {
         $options = $this->getEnvironment();
         if (isset($options['deployment'][$option])) {
-            return $options['deployment'][$option];
+            if (is_array($default) && ($options['deployment'][$option] == '')) {
+                return $default;
+            } else {
+                return $options['deployment'][$option];                
+            }
         } else {
             return $default;
         }
@@ -167,8 +171,12 @@ class Mage_Config
     public function release($option, $default = false)
     {
         $options = $this->getEnvironment();
-        if (isset($options['releases'][$option])) {
-            return $options['releases'][$option];
+        if (isset($options['releases'][$option])) {
+            if (is_array($default) && ($options['releases'][$option] == '')) {
+                return $default;
+            } else {
+                return $options['releases'][$option];
+            }
         } else {
             return $default;
         }
@@ -177,7 +185,12 @@ class Mage_Config
     public function scm($option, $default = false)
     {
         $options = $this->_scm;
-        if (isset($options[$option])) {
+        if (isset($options[$option])) {
+            if (is_array($default) && ($options[$option] == '')) {
+                return $default;
+            } else {
+                return $options[$option];
+            }
             return $options[$option];
         } else {
             return $default;
@@ -187,8 +200,12 @@ class Mage_Config
     public function general($option, $default = false)
     {
         $options = $this->_general;
-        if (isset($options[$option])) {
-            return $options[$option];
+        if (isset($options[$option])) {
+            if (is_array($default) && ($options[$option] == '')) {
+                return $default;
+            } else {
+                return $options[$option];
+            }
         } else {
             return $default;
         }
@@ -197,8 +214,12 @@ class Mage_Config
     public function mail($option, $default = false)
     {
         $options = $this->_general;
-        if (isset($options['mail'][$option])) {
-            return $options['mail'][$option];
+        if (isset($options['mail'][$option])) {
+            if (is_array($default) && ($options['mail'][$option] == '')) {
+                return $default;
+            } else {
+                return $options['mail'][$option];
+            }
         } else {
             return $default;
         }
diff --git a/bin/mage b/bin/mage
index 0d95d4b..a569d25 100755
--- a/bin/mage
+++ b/bin/mage
@@ -1,5 +1,5 @@
 #!/bin/sh
-#VERSION:0.9.4
+#VERSION:0.9.5
 
 SCRIPT=$(readlink -f $0)
 DIR=$(dirname $SCRIPT)
diff --git a/bin/mage.php b/bin/mage.php
index 9286041..25a306b 100644
--- a/bin/mage.php
+++ b/bin/mage.php
@@ -24,7 +24,7 @@ date_default_timezone_set('UTC');
 
 $baseDir = dirname(dirname(__FILE__));
 
-define('MAGALLANES_VERSION', '0.9.4');
+define('MAGALLANES_VERSION', '0.9.5');
 
 require_once $baseDir . '/Mage/spyc.php';
 require_once $baseDir . '/Mage/Autoload.php';