Update Locator to handle null locations

Fixes #7