diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 14e5463ef..9e8ddfd08 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -358,7 +358,11 @@ class BulkAssetsController extends Controller * to someone/something. */ if ($request->filled('status_id')) { - $updated_status = Statuslabel::find($request->input('status_id')); + try { + $updated_status = Statuslabel::findOrFail($request->input('status_id')); + } catch (ModelNotFoundException $e) { + return redirect($bulk_back_url)->with('error', trans('admin/statuslabels/message.does_not_exist')); + } // We cannot assign a non-deployable status type if the asset is already assigned. // This could probably be added to a form request. @@ -366,7 +370,7 @@ class BulkAssetsController extends Controller // Otherwise we need to make sure the status type is still a deployable one. if ( ($asset->assigned_to == '') - || ($updated_status->deployable == '1') && ($asset->assetstatus->deployable == '1') + || ($updated_status->deployable == '1') && ($asset->assetstatus?->deployable == '1') ) { $this->update_array['status_id'] = $updated_status->id; }