Fixed an issue where producer addresses with NULL Country fields were not migrated.
Removed a completed @todo comment.