Update Locator to handle null locations
Merge pull request #31 from nhorstmeier/EmptyLocations

Update Locator to handle null locations
fixes #7