[fix bug 844733] Return 404 for non-existent countries. DONTMERGE