Actually use tag_wrapper, also change error message