From 3746bc333bdfac73ba9300d57cde8f2fd39b3a48 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 6 Jul 2015 14:12:49 -0700
Subject: [PATCH] Better checking for model name and category name

---
 app/controllers/admin/AssetsController.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 71db89cefb..8704a5866d 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -1065,7 +1065,11 @@ class AssetsController extends AdminController
 
 		->addColumn('model',function($assets)
 			{
-			    return $assets->model->name;
+				if ($assets->model) {
+			    	return $assets->model->name;
+			    } else {
+				    return 'No model';
+				}
 			})
 
 	    ->addColumn('status',function($assets)
@@ -1087,7 +1091,11 @@ class AssetsController extends AdminController
             })
 		->addColumn('category',function($assets)
 			{
-				return $assets->model->category->name;
+				if (isset($assets->model->category)) {
+			    	return $assets->model->category->name;
+			    } else {
+				    return 'No category';
+				}
 
 			})