diff --git a/src/Commands/ActionMakeCommand.php b/src/Commands/ActionMakeCommand.php
index c023cc9..0ad3db5 100644
--- a/src/Commands/ActionMakeCommand.php
+++ b/src/Commands/ActionMakeCommand.php
@@ -6,5 +6,6 @@ class ActionMakeCommand extends ActionCommand
 {
     protected $signature = 'make:ussd-action
                             {name : The name of the USSD Action}
+                            {--init : Create the class as the initial USSD action}
                             {--force : Create the class even if USSD action already exists}';
 }
diff --git a/src/Commands/ExceptionHandlerCommand.php b/src/Commands/ExceptionHandlerCommand.php
new file mode 100644
index 0000000..887f492
--- /dev/null
+++ b/src/Commands/ExceptionHandlerCommand.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Sparors\Ussd\Commands;
+
+class ExceptionHandlerCommand extends GeneratorCommand
+{
+    protected $type = 'USSD Exception Handler';
+
+    protected $description = 'Create a new USSD exception handler class';
+
+    protected $signature = 'ussd:exception-handler
+                            {name : The name of the USSD Exception Handler}
+                            {--force : Create the class even if USSD exception handler already exists}';
+
+    protected function getStub()
+    {
+        return __DIR__.'/../../stubs/exception-handler.stub';
+    }
+
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $this->extendNamespace('ExceptionHandlers');
+    }
+}
diff --git a/src/Commands/ExceptionHandlerMakeCommand.php b/src/Commands/ExceptionHandlerMakeCommand.php
new file mode 100644
index 0000000..2ed041f
--- /dev/null
+++ b/src/Commands/ExceptionHandlerMakeCommand.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Sparors\Ussd\Commands;
+
+class ExceptionHandlerMakeCommand extends ExceptionHandlerCommand
+{
+    protected $signature = 'make:ussd-exception-handler
+                            {name : The name of the USSD Exception Handler}
+                            {--force : Create the class even if USSD exception handler already exists}';
+}
diff --git a/src/Commands/StateMakeCommand.php b/src/Commands/StateMakeCommand.php
index 0924456..614bdba 100644
--- a/src/Commands/StateMakeCommand.php
+++ b/src/Commands/StateMakeCommand.php
@@ -6,5 +6,7 @@ class StateMakeCommand extends StateCommand
 {
     protected $signature = 'make:ussd-state
                             {name : The name of the USSD State}
+                            {--init : Create the class as an initial USSD state}
+                            {--cont : Create the class as a continuing USSD state}
                             {--force : Create the class even if USSD state already exists}';
 }
diff --git a/src/UssdServiceProvider.php b/src/UssdServiceProvider.php
index 6579037..6ddae9d 100644
--- a/src/UssdServiceProvider.php
+++ b/src/UssdServiceProvider.php
@@ -14,6 +14,8 @@
 use Sparors\Ussd\Commands\ResponseMakeCommand;
 use Illuminate\Foundation\Console\AboutCommand;
 use Sparors\Ussd\Commands\ConfiguratorMakeCommand;
+use Sparors\Ussd\Commands\ExceptionHandlerCommand;
+use Sparors\Ussd\Commands\ExceptionHandlerMakeCommand;
 
 class UssdServiceProvider extends ServiceProvider
 {
@@ -61,6 +63,8 @@ protected function bootForConsole()
             DecisionMakeCommand::class,
             ConfiguratorCommand::class,
             ConfiguratorMakeCommand::class,
+            ExceptionHandlerCommand::class,
+            ExceptionHandlerMakeCommand::class,
         ]);
 
         AboutCommand::add('USSD', [
diff --git a/stubs/exception-handler.stub b/stubs/exception-handler.stub
new file mode 100644
index 0000000..a1bc69c
--- /dev/null
+++ b/stubs/exception-handler.stub
@@ -0,0 +1,14 @@
+<?php
+
+namespace {{ namespace }};
+
+use Exception;
+use Sparors\Ussd\Contracts\ExceptionHandler;
+
+class {{ class }} implements ExceptionHandler
+{
+    public function handle(Exception $exception): string
+    {
+        return $exception->getMessage();
+    }
+}
diff --git a/tests/Integration/CommandTest.php b/tests/Integration/CommandTest.php
index d534379..b0734d4 100644
--- a/tests/Integration/CommandTest.php
+++ b/tests/Integration/CommandTest.php
@@ -7,7 +7,8 @@
 
 final class CommandTest extends TestCase
 {
-    public function test_action_command_print_out_success_when_class_does_not_exists()
+    /** @dataProvider data_available_make_commands */
+    public function test_action_command_print_out_success_when_class_does_not_exists($command, $class)
     {
         File::shouldReceive('exists')->once();
         File::shouldReceive('isDirectory')->once();
@@ -15,59 +16,34 @@ public function test_action_command_print_out_success_when_class_does_not_exists
         File::shouldReceive('get')->once();
         File::shouldReceive('put')->once();
 
-        $this->artisan('ussd:action', ['name' => 'Save'])
-            ->expectsOutputToContain('USSD Action [app/Ussd/Actions/Save.php] created successfully.')
+        $this->artisan($command, ['name' => $class])
+            ->expectsOutputToContain($class)
             ->assertExitCode(0);
     }
 
-    public function test_action_command_print_out_error_when_class_exists()
+    /** @dataProvider data_available_make_commands */
+    public function test_action_command_print_out_error_when_class_exists($command, $class)
     {
         File::shouldReceive('exists')->once()->andReturn(true);
 
-        $this->artisan('ussd:action', ['name' => 'Save'])
-            ->expectsOutputToContain('USSD Action already exists.')
+        $this->artisan($command, ['name' => $class])
+            ->expectsOutputToContain('already exists.')
             ->assertExitCode(0);
     }
 
-    /** @dataProvider data_available_make_commands */
-    public function test_make_commands_are_available($command)
-    {
-        $this->artisan($command, ['name' => 'NameLess'])->assertExitCode(0);
-    }
-
     public static function data_available_make_commands()
     {
         return [
-            ['ussd:state'],
-            ['make:ussd-state'],
-            ['ussd:action'],
-            ['make:ussd-action'],
-            ['ussd:decision'],
-            ['make:ussd-decision'],
-            ['ussd:configurator'],
-            ['make:ussd-configurator'],
+            ['ussd:state', 'WelcomeState'],
+            ['make:ussd-state', 'WelcomeState'],
+            ['ussd:action', 'MenuAction'],
+            ['make:ussd-action', 'MenuAction'],
+            ['ussd:decision', 'StrictEqual'],
+            ['make:ussd-decision', 'StrictEqual'],
+            ['ussd:configurator', 'DynamicConfigurator'],
+            ['make:ussd-configurator', 'DynamicConfigurator'],
+            ['ussd:exception-handler', 'CatchExceptionHandler'],
+            ['make:ussd-exception-handler', 'CatchExceptionHandler'],
         ];
     }
-
-    public function test_state_command_print_out_success_when_class_does_not_exists()
-    {
-        File::shouldReceive('exists')->once();
-        File::shouldReceive('isDirectory')->once();
-        File::shouldReceive('makeDirectory')->once();
-        File::shouldReceive('get')->once();
-        File::shouldReceive('put')->once();
-
-        $this->artisan('ussd:state', ['name' => 'Welcome'])
-            ->expectsOutputToContain('USSD State [app/Ussd/States/Welcome.php] created successfully.')
-            ->assertExitCode(0);
-    }
-
-    public function test_state_command_print_out_error_when_class_exists()
-    {
-        File::shouldReceive('exists')->once()->andReturn(true);
-
-        $this->artisan('ussd:state', ['name' => 'Welcome'])
-            ->expectsOutputToContain('USSD State already exists.')
-            ->assertExitCode(0);
-    }
 }