Refactor root exceptions
Refactor root exceptions