diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index 7d75ecaa5a..6e12ba163c 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -350,7 +350,7 @@ class Button implements \IteratorAggregate, FormInterface
      */
     public function initialize()
     {
-        throw new BadMethodCallException('Buttons cannot be initialized. Call initialized() on the root form instead.');
+        throw new BadMethodCallException('Buttons cannot be initialized. Call initialize() on the root form instead.');
     }
 
     /**
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index 1c8e9244a2..2a19d58e06 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -790,21 +790,21 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     /**
      * Unsupported method.
      *
-     * @return null Always returns null.
+     * @return Boolean Always returns false.
      */
     public function getAutoInitialize()
     {
-        return null;
+        return false;
     }
 
     /**
      * Unsupported method.
      *
-     * @return null Always returns null.
+     * @return Boolean Always returns false.
      */
     public function getInheritData()
     {
-        return null;
+        return false;
     }
 
     /**