diff --git a/src/Console/Domain/AllAppModules/AppModuleCreator.php b/src/Console/Domain/AllAppModules/AppModuleCreator.php
index 1225225f..f7716397 100644
--- a/src/Console/Domain/AllAppModules/AppModuleCreator.php
+++ b/src/Console/Domain/AllAppModules/AppModuleCreator.php
@@ -8,7 +8,6 @@
 use Gacela\Framework\ClassResolver\Config\ConfigResolver;
 use Gacela\Framework\ClassResolver\DependencyProvider\DependencyProviderNotFoundException;
 use Gacela\Framework\ClassResolver\DependencyProvider\DependencyProviderResolver;
-use Gacela\Framework\ClassResolver\Factory\FactoryNotFoundException;
 use Gacela\Framework\ClassResolver\Factory\FactoryResolver;
 use ReflectionClass;
 
@@ -65,17 +64,13 @@ private function moduleName(string $facadeClass): string
      */
     private function findFactory(string $facadeClass): ?string
     {
-        try {
-            $resolver = $this->factoryResolver->resolve($facadeClass);
-
-            if ((new ReflectionClass($resolver))->isAnonymous()) {
-                throw new FactoryNotFoundException($facadeClass);
-            }
+        $resolver = $this->factoryResolver->resolve($facadeClass);
 
-            return $resolver::class;
-        } catch (FactoryNotFoundException $e) {
+        if ((new ReflectionClass($resolver))->isAnonymous()) {
             return null;
         }
+
+        return $resolver::class;
     }
 
     /**
diff --git a/src/Framework/ClassResolver/AbstractClassResolver.php b/src/Framework/ClassResolver/AbstractClassResolver.php
index 56cde920..8d0628ff 100644
--- a/src/Framework/ClassResolver/AbstractClassResolver.php
+++ b/src/Framework/ClassResolver/AbstractClassResolver.php
@@ -163,15 +163,10 @@ private function getGacelaConfigFile(): GacelaConfigFileInterface
 
     private function createDefaultGacelaClass(): ?object
     {
-        switch ($this->getResolvableType()) {
-            case FactoryResolver::TYPE:
-                return new class() extends AbstractFactory {
-                };
-            case ConfigResolver::TYPE:
-                return new class() extends AbstractConfig {
-                };
-            default:
-                return null;
-        }
+        return match ($this->getResolvableType()) {
+            FactoryResolver::TYPE => new class() extends AbstractFactory {},
+            ConfigResolver::TYPE => new class() extends AbstractConfig {},
+            default => null,
+        };
     }
 }
diff --git a/src/Framework/ClassResolver/Factory/FactoryNotFoundException.php b/src/Framework/ClassResolver/Factory/FactoryNotFoundException.php
deleted file mode 100644
index 8c24be12..00000000
--- a/src/Framework/ClassResolver/Factory/FactoryNotFoundException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Gacela\Framework\ClassResolver\Factory;
-
-use Exception;
-use Gacela\Framework\ClassResolver\ClassResolverExceptionTrait;
-
-final class FactoryNotFoundException extends Exception
-{
-    use ClassResolverExceptionTrait;
-
-    /**
-     * @param object|class-string $caller
-     */
-    public function __construct($caller)
-    {
-        parent::__construct($this->buildMessage($caller, 'Factory'));
-    }
-}
diff --git a/src/Framework/ClassResolver/Factory/FactoryResolver.php b/src/Framework/ClassResolver/Factory/FactoryResolver.php
index 708d244a..85899d8b 100644
--- a/src/Framework/ClassResolver/Factory/FactoryResolver.php
+++ b/src/Framework/ClassResolver/Factory/FactoryResolver.php
@@ -13,18 +13,12 @@ final class FactoryResolver extends AbstractClassResolver
 
     /**
      * @param object|class-string $caller
-     *
-     * @throws FactoryNotFoundException
      */
     public function resolve(object|string $caller): AbstractFactory
     {
-        /** @var ?AbstractFactory $resolved */
+        /** @var AbstractFactory $resolved */
         $resolved = $this->doResolve($caller);
 
-        if ($resolved === null) {
-            throw new FactoryNotFoundException($caller);
-        }
-
         return $resolved;
     }