From 534e40feb80143bdf3a7adfe25c1eb4a89b71679 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 12 Jan 2017 03:55:54 -0800
Subject: [PATCH] Fixed bad fieldset call

---
 app/Http/Controllers/Api/AssetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 1af38a491f..62b44ba711 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -291,7 +291,7 @@ class AssetsController extends Controller
                 $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
 
             if ($request->has('model_id')) {
-                if ($model = AssetModel::find($request->get('model_id'))) {
+                if (($model = AssetModel::find($request->get('model_id'))) && (isset($model->fieldset))) {
                     foreach ($model->fieldset->fields as $field) {
                         if ($request->has(CustomField::name_to_db_name($field->name))) {
                             $asset->{CustomField::name_to_db_name($field->name)} = e($request->input(CustomField::name_to_db_name($field->name)));