diff --git a/shared/mongodb/__init__.py b/shared/mongodb/__init__.py
index ed187bd..6ffadda 100644
--- a/shared/mongodb/__init__.py
+++ b/shared/mongodb/__init__.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 from .classes.dataset import Dataset
-from .classes.exceptions import NoDocumentFoundException
 from .classes.visual_communication import VisualCommunication
 from .utils.connect_mongodb import connect_mongodb
 from .utils.count_documents import count_documents
diff --git a/shared/mongodb/classes/__init__.py b/shared/mongodb/classes/__init__.py
index e58720b..129df79 100755
--- a/shared/mongodb/classes/__init__.py
+++ b/shared/mongodb/classes/__init__.py
@@ -3,5 +3,4 @@
 from __future__ import annotations
 
 from .dataset import Dataset
-from .exceptions import NoDocumentFoundException
 from .visual_communication import VisualCommunication
diff --git a/shared/mongodb/exceptions/__init__.py b/shared/mongodb/exceptions/__init__.py
new file mode 100644
index 0000000..6daba63
--- /dev/null
+++ b/shared/mongodb/exceptions/__init__.py
@@ -0,0 +1 @@
+from .no_document_found import NoDocumentFoundException
diff --git a/shared/mongodb/classes/no_document_found.py b/shared/mongodb/exceptions/no_document_found.py
similarity index 80%
rename from shared/mongodb/classes/no_document_found.py
rename to shared/mongodb/exceptions/no_document_found.py
index 1df8a78..dfe1c99 100755
--- a/shared/mongodb/classes/no_document_found.py
+++ b/shared/mongodb/exceptions/no_document_found.py
@@ -1,7 +1,5 @@
 """Definition of database exception."""
 
-from __future__ import annotations
-
 
 class NoDocumentFoundException(Exception):
     """Database exception for when no documents are found."""
diff --git a/shared/mongodb/utils/get_visual_communication.py b/shared/mongodb/utils/get_visual_communication.py
index 0392215..edf9d5c 100755
--- a/shared/mongodb/utils/get_visual_communication.py
+++ b/shared/mongodb/utils/get_visual_communication.py
@@ -6,7 +6,8 @@ import logging
 
 from pymongo.collection import Collection
 
-from shared.mongodb import NoDocumentFoundException, VisualCommunication
+from shared.mongodb import VisualCommunication
+from shared.mongodb.exceptions import NoDocumentFoundException
 
 
 def get_visual_communication(