JARVIS-408 refactoring exception management