Fix error message and refactor common code

1) Include store name in the error message.
2) Refactor the common code for Zone configuration and clean up the
error message. Probably more can be cleaned up but not comfortable with
understanding and doing new code. So just refactored the common code
into a method.