diff --git a/monkey/monkey_island/cc/repository/__init__.py b/monkey/monkey_island/cc/repository/__init__.py
index 0ff63b842..cc89c5c57 100644
--- a/monkey/monkey_island/cc/repository/__init__.py
+++ b/monkey/monkey_island/cc/repository/__init__.py
@@ -1,6 +1,6 @@
+from .errors import RetrievalError
 from .file_storage import FileRetrievalError, IFileRepository, LocalStorageFileRepository
 from .i_agent_binary_repository import IAgentBinaryRepository, AgentRetrievalError
 from .agent_binary_repository import AgentBinaryRepository
 from .i_agent_configuration_repository import IAgentConfigurationRepository
 from .file_agent_configuration_repository import FileAgentConfigurationRepository
-from .errors import RetrievalError
diff --git a/monkey/monkey_island/cc/repository/file_storage/i_file_repository.py b/monkey/monkey_island/cc/repository/file_storage/i_file_repository.py
index a0865b797..2531fd711 100644
--- a/monkey/monkey_island/cc/repository/file_storage/i_file_repository.py
+++ b/monkey/monkey_island/cc/repository/file_storage/i_file_repository.py
@@ -1,8 +1,10 @@
 import abc
 from typing import BinaryIO
 
+from monkey_island.cc.repository import RetrievalError
 
-class FileRetrievalError(RuntimeError):
+
+class FileRetrievalError(RetrievalError):
     pass