Revert and add root exception