Fix for #1614 - make sure to specify a model's zone when it hasn't been signed yet.

This would need to be hotfixed to `master` and `release-0.11` as well.

@jamalex Can you take a quick look?