diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php
index deb6a1639b..500eb99eda 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php
@@ -71,16 +71,18 @@ EOT
 
         // user specified bundle name?
         $bundle = $input->getArgument('bundleName');
-        if ('' === $bundle) {
+        if (!$bundle) {
             $bundle = strtr($namespace, array('\\' => ''));
-        } elseif (!preg_match('/Bundle$/', $bundle)) {
+        }
+
+        if (!preg_match('/Bundle$/', $bundle)) {
             throw new \InvalidArgumentException('The bundle name must end with Bundle.');
         }
 
         $dir = $input->getArgument('dir');
 
         // add trailing / if necessary
-        $dir = '/' === substr($dir, -1, 1) ? $dir : $dir . '/';
+        $dir = '/' === substr($dir, -1, 1) ? $dir : $dir.'/';
 
         $targetDir = $dir.strtr($namespace, '\\', '/');