diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
index 63f97d76..53f6d90a 100644
--- a/Command/AbstractCommand.php
+++ b/Command/AbstractCommand.php
@@ -58,7 +58,10 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->output = $output;
         $this->cacheDir = $kernel->getCacheDir().'/propel';
 
-        if ($input->hasArgument('bundle') && '@' === substr($input->getArgument('bundle'), 0, 1)) {
+        if ($input->hasArgument('bundle')
+            && !empty($input->getArgument('bundle'))
+            && '@' === substr($input->getArgument('bundle'), 0, 1)
+        ) {
             $this->bundle = $this
                 ->getContainer()
                 ->get('kernel')