diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 92ba702a1..1b53d61aa 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -54,9 +54,9 @@ class AssetsTransformer
                 'id' => (int) $asset->company->id,
                 'name'=> e($asset->company->name)
             ] : null,
-            'location' => ($asset->assetLoc) ? [
-                'id' => (int) $asset->assetLoc->id,
-                'name'=> e($asset->assetLoc->name)
+            'location' => ($asset->assetloc) ? [
+                'id' => (int) $asset->assetloc->id,
+                'name'=> e($asset->assetloc->name)
             ]  : null,
             'rtd_location' => ($asset->defaultLoc) ? [
                 'id' => (int) $asset->defaultLoc->id,
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 1543103ec..8b93cf9b3 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -488,7 +488,6 @@
                     var error_text;
 
                     $("#ldaptestloginicon").html('');
-                    $("#ldaptestloginrow").addClass('danger');
                     $("#ldaptestloginstatus").addClass('text-danger');
                     $("#ldaptestloginicon").html('<i class="fa fa-exclamation-triangle text-danger"></i>');