Fix the issue when no location is selected
Merge pull request #265 from timschofield/develop

Fix the issue when no location is selected