From e63b3cb76ac51fd618af6c2f94141a55ad95fd6c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 10 May 2021 14:11:26 +1000
Subject: [PATCH] Return early from try block

---
 .../Controllers/Migration/StepsController.php | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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()