Merge myLocation and newLocation to one variable
More null checks for *Proximity methods