diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php
index cf740b04..95a18194 100755
--- a/app/Space/EnvironmentManager.php
+++ b/app/Space/EnvironmentManager.php
@@ -49,20 +49,22 @@ class EnvironmentManager
             'DB_PASSWORD='.$request->database_password."\n\n";
 
         try {
-            if ($this->checkDatabaseConnection($request)) {
-                if(\Schema::hasTable('users') ) {
-                    return [
-                        'error' => 'database_should_be_empty'
-                    ];
-                }
+
+            $this->checkDatabaseConnection($request);
+
+            if(\Schema::hasTable('users') ) {
+                return [
+                    'error' => 'database_should_be_empty'
+                ];
             }
+
         } catch (Exception $e) {
+
             return [
                 'error' => $e->getMessage()
             ];
         }
 
-
         try {
 
             file_put_contents($this->envPath, str_replace(
@@ -120,8 +122,6 @@ class EnvironmentManager
                 );
             }
 
-
-
         } catch (Exception $e) {
             return [
                 'error' => 'mail_variables_save_error'
@@ -318,12 +318,6 @@ class EnvironmentManager
             ],
         ]);
 
-        try {
-            DB::connection()->getPdo();
-
-            return true;
-        } catch (Exception $e) {
-            return $e;
-        }
+        return DB::connection()->getPdo();
     }
 }
diff --git a/resources/assets/js/views/wizard/Database.vue b/resources/assets/js/views/wizard/Database.vue
index 3677ea67..434f4a0f 100644
--- a/resources/assets/js/views/wizard/Database.vue
+++ b/resources/assets/js/views/wizard/Database.vue
@@ -206,10 +206,10 @@ export default {
         } else {
           window.toastr['error'](this.$t('wizard.errors.' + response.data.error))
         }
-        this.loading = false
       } catch (e) {
-        console.log(e.response)
         window.toastr['error'](e.response.data.message)
+      } finally {
+        this.loading = false
       }
     }
   }