diff --git a/monkey/common/configuration/__init__.py b/monkey/common/configuration/__init__.py
index 1505f0e68..06ce30b50 100644
--- a/monkey/common/configuration/__init__.py
+++ b/monkey/common/configuration/__init__.py
@@ -1,6 +1,4 @@
-from .agent_configuration import (
-    AgentConfiguration,
-)
+from .agent_configuration import AgentConfiguration, InvalidConfigurationError
 from .agent_sub_configurations import (
     CustomPBAConfiguration,
     PluginConfiguration,
diff --git a/monkey/common/configuration/agent_configuration.py b/monkey/common/configuration/agent_configuration.py
index 71c4bfd49..fe42e303d 100644
--- a/monkey/common/configuration/agent_configuration.py
+++ b/monkey/common/configuration/agent_configuration.py
@@ -17,6 +17,10 @@ from .agent_sub_configurations import (
 )
 
 
+class InvalidConfigurationError(Exception):
+    pass
+
+
 @dataclass(frozen=True)
 class AgentConfiguration:
     keep_tunnel_open_time: float
diff --git a/monkey/common/utils/exceptions.py b/monkey/common/utils/exceptions.py
index 5935145e7..31cebca32 100644
--- a/monkey/common/utils/exceptions.py
+++ b/monkey/common/utils/exceptions.py
@@ -38,5 +38,7 @@ class DomainControllerNameFetchError(FailedExploitationError):
     """Raise on failed attempt to extract domain controller's name"""
 
 
+# TODO: This has been replaced by common.configuration.InvalidConfigurationError. Use that error
+#       instead and remove this one.
 class InvalidConfigurationError(Exception):
     """Raise when configuration is invalid"""