Finalized removing custom exceptions