diff --git a/app/Console/Commands/Setup/SetupDatabaseViaCLI.php b/app/Console/Commands/Setup/SetupDatabaseViaCLI.php
index c022015e..2959b6ab 100644
--- a/app/Console/Commands/Setup/SetupDatabaseViaCLI.php
+++ b/app/Console/Commands/Setup/SetupDatabaseViaCLI.php
@@ -138,8 +138,11 @@ trait SetupDatabaseViaCLI
             'DB_PASSWORD=' . $this->dbConfig['password'],
         ], $envContent);
 
-        if ($envContent !== null) {
-            File::put(base_path('.env'), $envContent);
+        if ($envContent === null) {
+            $this->warn('Error while saving your .env file. Please add your credentials manually before your proceed');
+            return;
         }
+
+        File::put(base_path('.env'), $envContent);
     }
 }