Add Exception, update docblocks, remove @since