diff --git a/gso/services/netbox_client.py b/gso/services/netbox_client.py
index 74f56982ae0ca33a3a4cb400f50c3f5e61ad44f4..3f49a0954e310c288a7dc4d2f2119a05ffd32d79 100644
--- a/gso/services/netbox_client.py
+++ b/gso/services/netbox_client.py
@@ -125,9 +125,8 @@ class NetboxClient:
     def delete_interface(self, device_name: str, iface_name: str) -> None:
         """Delete an interface from a device by name."""
         interface = self.get_interface_by_name_and_device(iface_name, device_name)
-        if interface:
+        if interface is not None:
             return interface.delete()
-        return None
 
     def create_device_type(self, manufacturer: str, model: str, slug: str) -> DeviceTypes:
         """Create a new device type in Netbox."""
@@ -199,8 +198,11 @@ class NetboxClient:
         return device
 
     def delete_device(self, device_name: str) -> None:
-        """Delete device by name."""
-        self.netbox.dcim.devices.get(name=device_name).delete()
+        """Delete device by name if exists."""
+        try:
+            self.netbox.dcim.devices.get(name=device_name).delete()
+        except AttributeError:
+            pass
 
     def attach_interface_to_lag(
         self,