removed exception, comments