JARVIS-408 refactoring exception management
JARVIS-408 refactoring exception management