diff --git a/netbox_agent/server.py b/netbox_agent/server.py
index 9a32042d..5e78876c 100644
--- a/netbox_agent/server.py
+++ b/netbox_agent/server.py
@@ -42,7 +42,7 @@ def update_netbox_location(self, server):
         nb_dc = self.get_netbox_datacenter()
 
         update = False
-        if dc and server.site.slug != nb_dc.slug:
+        if dc and server.site and server.site.slug != nb_dc.slug:
             logging.info('Datacenter location has changed from {} to {}, updating'.format(
                 server.site.slug,
                 nb_dc.slug,
@@ -50,7 +50,7 @@ def update_netbox_location(self, server):
             update = True
             server.site = nb_dc.id
 
-        if rack and server.rack != nb_rack:
+        if rack and server.rack and server.rack.id != nb_rack.id:
             logging.info('Rack location has changed from {} to {}, updating'.format(
                 server.rack,
                 nb_rack,