Prevent errors when country field is disabled

Fixes #6336