diff --git a/teos/errors.py b/common/errors.py
similarity index 100%
rename from teos/errors.py
rename to common/errors.py
diff --git a/teos/api.py b/teos/api.py
index a82107c..0bcbddb 100644
--- a/teos/api.py
+++ b/teos/api.py
@@ -3,7 +3,7 @@ import logging
 from flask import Flask, request, abort, jsonify
 
 from teos import LOG_PREFIX
-import teos.errors as errors
+import common.errors as errors
 from teos.inspector import InspectionFailed
 from teos.watcher import AppointmentLimitReached
 from teos.gatekeeper import NotEnoughSlots, AuthenticationFailure
diff --git a/teos/carrier.py b/teos/carrier.py
index c8bba1c..11b578f 100644
--- a/teos/carrier.py
+++ b/teos/carrier.py
@@ -3,7 +3,7 @@ from common.logger import Logger
 from teos.tools import bitcoin_cli
 import teos.rpc_errors as rpc_errors
 from teos.utils.auth_proxy import JSONRPCException
-from teos.errors import UNKNOWN_JSON_RPC_EXCEPTION, RPC_TX_REORGED_AFTER_BROADCAST
+from common.errors import UNKNOWN_JSON_RPC_EXCEPTION, RPC_TX_REORGED_AFTER_BROADCAST
 
 logger = Logger(actor="Carrier", log_name_prefix=LOG_PREFIX)
 
diff --git a/teos/inspector.py b/teos/inspector.py
index 89125d5..1a23151 100644
--- a/teos/inspector.py
+++ b/teos/inspector.py
@@ -4,7 +4,8 @@ from common.logger import Logger
 from common.tools import is_locator
 from common.constants import LOCATOR_LEN_HEX
 
-from teos import errors, LOG_PREFIX
+from teos import LOG_PREFIX
+from common import errors
 from teos.extended_appointment import ExtendedAppointment
 
 logger = Logger(actor="Inspector", log_name_prefix=LOG_PREFIX)
diff --git a/test/teos/unit/test_api.py b/test/teos/unit/test_api.py
index e8393d4..daac059 100644
--- a/test/teos/unit/test_api.py
+++ b/test/teos/unit/test_api.py
@@ -3,7 +3,7 @@ from shutil import rmtree
 from binascii import hexlify
 
 from teos.api import API
-import teos.errors as errors
+import common.errors as errors
 from teos.watcher import Watcher
 from teos.inspector import Inspector
 from teos.gatekeeper import UserInfo
diff --git a/test/teos/unit/test_inspector.py b/test/teos/unit/test_inspector.py
index 69b0558..51e2828 100644
--- a/test/teos/unit/test_inspector.py
+++ b/test/teos/unit/test_inspector.py
@@ -1,7 +1,7 @@
 import pytest
 from binascii import unhexlify
 
-import teos.errors as errors
+import common.errors as errors
 from teos.block_processor import BlockProcessor
 from teos.inspector import Inspector, InspectionFailed
 from teos.extended_appointment import ExtendedAppointment