[PD-830] Validation error if location missing

Due to template work, I'm basing this on top of pd-830 instead of master.