Fix tribunal/decision countries failing when invalid
country id encountered