Refactor Exception Class