diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
index 25e7f891..ef5b24f0 100644
--- a/Command/AbstractCommand.php
+++ b/Command/AbstractCommand.php
@@ -51,7 +51,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         $this->output = $output;
         $this->cacheDir = $this->getKernel()->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')
diff --git a/Command/BundleTrait.php b/Command/BundleTrait.php
index 12a39bbe..89098d5f 100644
--- a/Command/BundleTrait.php
+++ b/Command/BundleTrait.php
@@ -44,7 +44,7 @@ protected function getBundle(InputInterface $input, OutputInterface $output): Bu
             ->getContainer()
             ->get('kernel');
 
-        if ($input->hasArgument('bundle') && '@' === substr($input->getArgument('bundle'), 0, 1)) {
+        if ($input->hasArgument('bundle') && !empty($input->getArgument('bundle')) && '@' === substr($input->getArgument('bundle'), 0, 1)) {
             return $kernel->getBundle(substr($input->getArgument('bundle'), 1));
         }
 
diff --git a/Tests/Fixtures/Model/Map/BookTableMap.php b/Tests/Fixtures/Model/Map/BookTableMap.php
index 83f48ae4..298a1095 100644
--- a/Tests/Fixtures/Model/Map/BookTableMap.php
+++ b/Tests/Fixtures/Model/Map/BookTableMap.php
@@ -43,6 +43,11 @@ class BookTableMap extends TableMap
      */
     const TABLE_NAME = 'book';
 
+    /**
+     * The PHP name of this class (PascalCase)
+     */
+    const TABLE_PHP_NAME = 'Book';
+
     /**
      * The related Propel class for this table
      */
diff --git a/composer.json b/composer.json
index 373f1e0b..ef4d70ed 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     },
     "require": {
         "php": ">=7.4",
-        "propel/propel": "2.0.0-beta2",
+        "propel/propel": "2.0.0-beta2||2.0.0-beta3",
         "symfony/console": "^5.0||^6.0",
         "symfony/dependency-injection": "^5.0||^6.0",
         "symfony/framework-bundle": "^5.0||^6.0",