From 6b63808e346a21399cf0c22b0802fb5911a64bd4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 25 Sep 2017 11:25:15 -0700
Subject: [PATCH] Fix for asset location null on user

---
 app/Models/Asset.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 51ba984948..bf92e2f977 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -262,11 +262,12 @@ class Asset extends Depreciable
                 return $this->assignedTo();
             }
             if ($this->assignedType() == self::USER) {
+                if (!$this->assignedTo) {
+                    return $this->defaultLoc();
+                }
                 return $this->assignedTo->userLoc();
             }
-            if (!$this->assignedTo) {
-                return $this->defaultLoc();
-            }
+
         }
         return $this->defaultLoc();
     }