diff --git a/src/Commands/Component.php b/src/Commands/Component.php
deleted file mode 100644
index f1c0db8..0000000
--- a/src/Commands/Component.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Airwire\Commands;
-
-use Illuminate\Support\Str;
-
-class Component {
-    public static function register(string $name)
-    {
-        $service_provider = base_path() . "\app\Providers\AppServiceProvider.php";
-        file_put_contents($service_provider, preg_replace('/register[(][)][\s\S].*/', "register() {\n\t\tAirwire::component('" . Str::snake($name) . "', {$name}::class);", file_get_contents($service_provider)));
-    }
-}
\ No newline at end of file
diff --git a/src/Commands/ComponentCommand.php b/src/Commands/ComponentCommand.php
index 8175880..96b8a3f 100644
--- a/src/Commands/ComponentCommand.php
+++ b/src/Commands/ComponentCommand.php
@@ -15,7 +15,7 @@ class ComponentCommand extends Command
     {
         $name = Str::studly($this->argument('name'));
 
-        if (! is_dir($path = app_path('Airwire'))) {
+        if (!is_dir($path = app_path('Airwire'))) {
             mkdir($path);
         }
 
@@ -33,7 +33,26 @@ class ComponentCommand extends Command
         }
         PHP);
 
-        Component::register($name);
-        $this->line("✨ Component app/Airwire/{$name}.php has been created and registered!\n");
+        $this->register($name);
+    }
+
+    protected function register($name)
+    {
+        try {
+            $path = app_path('Providers/AppServiceProvider.php');
+
+            $snake = Str::snake($name);
+
+            file_put_contents($path, str_replace(
+                "function boot()\n    {",
+                "function boot()\n    {\n        \Airwire\Airwire::component('{$snake}', {$name}::class);",
+                file_get_contents($path)
+            ));
+
+            $this->line("✨ Component app/Airwire/{$name}.php has been created and registered!");
+        } catch (Exception $exception)
+        {
+            $this->error('The component could not be registered. Please check your app/Providers/AppServiceProvider.php');
+        }
     }
 }