diff --git a/src/Env.php b/src/Env.php
index 4884ad7..4ab439d 100644
--- a/src/Env.php
+++ b/src/Env.php
@@ -63,7 +63,7 @@ public static function convert($value, $options = null)
             return (int) $value;
         }
 
-        if ($options & self::STRIP_QUOTES) {
+        if (($options & self::STRIP_QUOTES) && !empty($value)) {
             return self::stripQuotes($value);
         }
 
diff --git a/tests/ConversionTest.php b/tests/ConversionTest.php
index 932799a..5eaee37 100644
--- a/tests/ConversionTest.php
+++ b/tests/ConversionTest.php
@@ -5,6 +5,7 @@ class ConversionTest extends PHPUnit_Framework_TestCase
     public function dataProvider()
     {
         return array(
+            array('', null, ''),
             array('false', null, false),
             array('FALSE', null, false),
             array('true', null, true),