Correctly validate if match and tournament have a value