diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index 144498f32d9f9..156afe5b53653 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -146,9 +146,11 @@ public function getPhpValues()
         $values = array();
         foreach ($this->getValues() as $name => $value) {
             $qs = http_build_query(array($name => $value), '', '&');
-            parse_str($qs, $expandedValue);
-            $varName = substr($name, 0, strlen(key($expandedValue)));
-            $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+            if(!empty($qs)) {
+                parse_str($qs, $expandedValue);
+                $varName = substr($name, 0, strlen(key($expandedValue)));
+                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+            }
         }
 
         return $values;
@@ -169,9 +171,11 @@ public function getPhpFiles()
         $values = array();
         foreach ($this->getFiles() as $name => $value) {
             $qs = http_build_query(array($name => $value), '', '&');
-            parse_str($qs, $expandedValue);
-            $varName = substr($name, 0, strlen(key($expandedValue)));
-            $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+            if(!empty($qs)) {
+                parse_str($qs, $expandedValue);
+                $varName = substr($name, 0, strlen(key($expandedValue)));
+                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
+            }
         }
 
         return $values;