From 26fd7f7e793e84ba7c9bde2cccc971adb35e8165 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 6 Sep 2018 14:28:04 -0700
Subject: [PATCH] I have no idea why this was necessary suddenly

---
 .../Controllers/CustomFieldsetsController.php     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index c035e130ea..fae646e9d1 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -42,14 +42,19 @@ class CustomFieldsetsController extends Controller
         if ($cfset) {
             $custom_fields_list = ["" => "Add New Field to Fieldset"] + CustomField::pluck("name", "id")->toArray();
 
+
             $maxid = 0;
             foreach ($cfset->fields() as $field) {
-                if ($field->pivot->order > $maxid) {
-                    $maxid=$field->pivot->order;
-                }
-                if (isset($custom_fields_list[$field->id])) {
-                    unset($custom_fields_list[$field->id]);
+
+                if ($field) {
+                    if ($field->pivot->order > $maxid) {
+                        $maxid=$field->pivot->order;
+                    }
+                    if (isset($custom_fields_list[$field->id])) {
+                        unset($custom_fields_list[$field->id]);
+                    }
                 }
+
             }
 
             return view("custom_fields.fieldsets.view")