diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php index 8c4cbd42ed4d..5f8ddac4693d 100644 --- a/app/Http/Controllers/Migration/StepsController.php +++ b/app/Http/Controllers/Migration/StepsController.php @@ -176,18 +176,22 @@ class StepsController extends BaseController ); } - $migrationData = $this->generateMigrationData($request->all()); + try { + $migrationData = $this->generateMigrationData($request->all()); - $completeService = (new CompleteService(session('MIGRATION_ACCOUNT_TOKEN'))) - ->data($migrationData) - ->endpoint(session('MIGRATION_ENDPOINT')) - ->start(); - - if ($completeService->isSuccessful()) { - return view('migration.completed'); + $completeService = (new CompleteService(session('MIGRATION_ACCOUNT_TOKEN'))) + ->data($migrationData) + ->endpoint(session('MIGRATION_ENDPOINT')) + ->start(); } + finally { + + if ($completeService->isSuccessful()) { + return view('migration.completed'); + } - return view('migration.completed', ['customMessage' => $completeService->getErrors()[0]]); + return view('migration.completed', ['customMessage' => $completeService->getErrors()[0]]); + } } public function completed()