Add terms check and silent skip.