Updating the exceptions and documentation.