diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index cf338dbb59..a8be424841 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -151,11 +151,11 @@ class CustomFieldsController extends Controller
      */
     public function destroy($field_id)
     {
-        $field = CustomField::find($field_id);
+        if ($field = CustomField::find($field_id)) {
 
             $this->authorize('delete', $field);
 
-        if ($field->fieldset->count()>0) {
+            if (($field->fieldset) && ($field->fieldset->count() > 0)) {
                 return redirect()->back()->withErrors(['message' => "Field is in-use"]);
             }
             $field->delete();
@@ -163,6 +163,9 @@ class CustomFieldsController extends Controller
                 ->with("success", trans('admin/custom_fields/message.field.delete.success'));
         }
 
+        return redirect()->back()->withErrors(['message' => "Field does not exist"]);
+    }
+
 
     /**
      * Return a view to edit a custom field