diff --git a/gso/services/netbox_client.py b/gso/services/netbox_client.py
index 28774d245c8a93d143af52dd471466cb11dcd901..02f5313a94d88e48447335c7945da5e14ea0aabb 100644
--- a/gso/services/netbox_client.py
+++ b/gso/services/netbox_client.py
@@ -8,21 +8,9 @@ from pynetbox.models.dcim import Devices, DeviceTypes, Interfaces
 from gso.products.product_types.router import Router
 from gso.settings import load_oss_params
 from gso.utils.device_info import DEFAULT_SITE, FEASIBLE_IP_TRUNK_LAG_RANGE, ROUTER_ROLE, TierInfo
+from gso.utils.exceptions import NotFoundError, WorkflowStateError
 
 
-class NotFoundError(Exception):
-    """Exception raised for not found search."""
-
-    pass
-
-
-class WorkflowStateError(Exception):
-    """Exception raised on problems during workflow."""
-
-    pass
-
-
-# Define device models
 class Manufacturer(pydantic.BaseModel):
     """Defines the manufacturer of a device."""
 
diff --git a/gso/utils/exceptions.py b/gso/utils/exceptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..21c127e88b3144d43eb6474e8a890881f36135b0
--- /dev/null
+++ b/gso/utils/exceptions.py
@@ -0,0 +1,10 @@
+class NotFoundError(Exception):
+    """Exception raised for not found search."""
+
+    pass
+
+
+class WorkflowStateError(Exception):
+    """Exception raised on problems during workflow."""
+
+    pass