diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index 55499ab22bd2..ee3e4b14c64e 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -38,14 +38,23 @@ public function getIndex()
             'licenses',
         )->find(Auth::user()->id);
 
+        $field_array = array();
+
         // Loop through all the custom fields that are applied to any model the user has assigned
         foreach ($user->assets as $asset) {
-            foreach ($asset->model->fieldset->fields as $field) {
-                // check and make sure they're allowed to see the value of the custom field
-                if ($field->display_in_user_view == '1') {
-                    $field_array[$field->db_column] = $field->name;
+
+            // Make sure the model has a custom fieldset before trying to loop through the associated fields
+            if ($asset->model->fieldset) {
+
+                foreach ($asset->model->fieldset->fields as $field) {
+                    // check and make sure they're allowed to see the value of the custom field
+                    if ($field->display_in_user_view == '1') {
+                        $field_array[$field->db_column] = $field->name;
+                    }
+                    
                 }
             }
+
         }
 
         // Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns