replace a leftover with arguments with args like other condition statement. Shorten the throw string to reduce dist size so can add features